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

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_load_ds_location().
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: a4fa702488774527fe5e1a044737973c306c1b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fa702488774527fe5e1a044… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 18:34:05 2016 +0200 wined3d: Use the texture dimension helpers in surface_load_ds_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 72233bd..f358805 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2637,8 +2637,8 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win } else { - w = wined3d_texture_get_level_width(surface->container, surface->texture_level); - h = wined3d_texture_get_level_height(surface->container, surface->texture_level); + w = wined3d_texture_get_level_width(texture, surface->texture_level); + h = wined3d_texture_get_level_height(texture, surface->texture_level); } if (surface->current_renderbuffer) @@ -2717,8 +2717,9 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, context->swapchain->front_buffer->sub_resources[0].u.surface, NULL, WINED3D_LOCATION_DRAWABLE); - surface_depth_blt(surface, context, texture->texture_rgb.name, - 0, surface->pow2Height - h, w, h, surface->texture_target); + surface_depth_blt(surface, context, texture->texture_rgb.name, 0, + wined3d_texture_get_level_pow2_height(texture, surface->texture_level) - h, + w, h, surface->texture_target); checkGLcall("depth_blt"); context_invalidate_state(context, STATE_FRAMEBUFFER);

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in fb_copy_to_texture_hwstretch().
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 58f309b491d37288653bbff29c830550a5883346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58f309b491d37288653bbff29… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 18:34:03 2016 +0200 wined3d: Use the texture dimension helpers in fb_copy_to_texture_hwstretch(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 92ff442..4babf33 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1980,13 +1980,13 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st const RECT *src_rect, const RECT *dst_rect_in, enum wined3d_texture_filter_type filter) { unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); + unsigned int src_width, src_height, src_pow2_width, src_pow2_height; struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; GLuint src, backup = 0; float left, right, top, bottom; /* Texture coordinates */ const struct wined3d_gl_info *gl_info; - unsigned int src_width, src_height; struct wined3d_context *context; GLenum drawBuffer = GL_BACK; GLenum offscreen_buffer; @@ -2006,6 +2006,8 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st offscreen_buffer = context_get_offscreen_gl_buffer(context); src_width = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); + src_pow2_width = wined3d_texture_get_level_pow2_width(src_texture, src_surface->texture_level); + src_pow2_height = wined3d_texture_get_level_pow2_height(src_texture, src_surface->texture_level); src_offscreen = wined3d_resource_is_offscreen(&src_texture->resource); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; @@ -2096,11 +2098,11 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st checkGLcall("glGenTextures(1, &src)"); context_bind_texture(context, GL_TEXTURE_2D, src); - /* TODO: Only copy the part that will be read. Use src_rect->left, src_rect->bottom as origin, but with the width watch - * out for power of 2 sizes - */ - gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, src_surface->pow2Width, - src_surface->pow2Height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); + /* TODO: Only copy the part that will be read. Use src_rect->left, + * src_rect->bottom as origin, but with the width watch out for power + * of 2 sizes. */ + gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, src_pow2_width, + src_pow2_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); checkGLcall("glTexImage2D"); gl_info->gl_ops.gl.p_glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, src_width, src_height); @@ -2137,10 +2139,10 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st if (src_texture->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) { - left /= src_surface->pow2Width; - right /= src_surface->pow2Width; - top /= src_surface->pow2Height; - bottom /= src_surface->pow2Height; + left /= src_pow2_width; + right /= src_pow2_width; + top /= src_pow2_height; + bottom /= src_pow2_height; } /* draw the source texture stretched and upside down. The correct surface is bound already */ @@ -2215,16 +2217,16 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st gl_info->gl_ops.gl.p_glVertex2i(0, src_height); /* bottom left */ - gl_info->gl_ops.gl.p_glTexCoord2f(0.0f, (float)src_height / (float)src_surface->pow2Height); + gl_info->gl_ops.gl.p_glTexCoord2f(0.0f, (float)src_height / (float)src_pow2_height); gl_info->gl_ops.gl.p_glVertex2i(0, 0); /* bottom right */ - gl_info->gl_ops.gl.p_glTexCoord2f((float)src_width / (float)src_surface->pow2Width, - (float)src_height / (float)src_surface->pow2Height); + gl_info->gl_ops.gl.p_glTexCoord2f((float)src_width / (float)src_pow2_width, + (float)src_height / (float)src_pow2_height); gl_info->gl_ops.gl.p_glVertex2i(src_width, 0); /* top right */ - gl_info->gl_ops.gl.p_glTexCoord2f((float)src_width / (float)src_surface->pow2Width, 0.0f); + gl_info->gl_ops.gl.p_glTexCoord2f((float)src_width / (float)src_pow2_width, 0.0f); gl_info->gl_ops.gl.p_glVertex2i(src_width, src_height); gl_info->gl_ops.gl.p_glEnd(); }

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_set_compatible_renderbuffer( ).
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 7be5ccb21e7c679bc2aa86b5f7ea8bf1405bcfee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7be5ccb21e7c679bc2aa86b5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 18:34:02 2016 +0200 wined3d: Use the texture dimension helpers in surface_set_compatible_renderbuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fc6c2f7..92ff442 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1243,17 +1243,17 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const if (rt && rt->container->resource.format->id != WINED3DFMT_NULL) { - width = rt->pow2Width; - height = rt->pow2Height; + width = wined3d_texture_get_level_pow2_width(rt->container, rt->texture_level); + height = wined3d_texture_get_level_pow2_height(rt->container, rt->texture_level); } else { - width = surface->pow2Width; - height = surface->pow2Height; + width = wined3d_texture_get_level_pow2_width(surface->container, surface->texture_level); + height = wined3d_texture_get_level_pow2_height(surface->container, surface->texture_level); } - src_width = surface->pow2Width; - src_height = surface->pow2Height; + src_width = wined3d_texture_get_level_pow2_width(surface->container, surface->texture_level); + src_height = wined3d_texture_get_level_pow2_height(surface->container, surface->texture_level); /* A depth stencil smaller than the render target is not valid */ if (width > src_width || height > src_height) return;

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_depth_blt().
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 2633f9bde3f8b9ee9ffddb245d1f59ffd43a4b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2633f9bde3f8b9ee9ffddb245… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 18:34:04 2016 +0200 wined3d: Use the texture dimension helpers in surface_depth_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4babf33..72233bd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2561,7 +2561,9 @@ static void surface_depth_blt(const struct wined3d_surface *surface, struct wine gl_info->gl_ops.gl.p_glDepthRange(0.0, 1.0); SetRect(&rect, 0, h, w, 0); - surface_get_blt_info(target, &rect, surface->pow2Width, surface->pow2Height, &info); + surface_get_blt_info(target, &rect, + wined3d_texture_get_level_pow2_width(surface->container, surface->texture_level), + wined3d_texture_get_level_pow2_height(surface->container, surface->texture_level), &info); context_active_texture(context, context->gl_info, 0); gl_info->gl_ops.gl.p_glGetIntegerv(info.binding, &old_binding); gl_info->gl_ops.gl.p_glBindTexture(info.bind_target, texture);

1 0

Paul Gofman : d3dx9: D3DXQuaternionSquadSetup should support arguments aliasing.
by Alexandre Julliard April 19, 2016

April 19, 2016

Module: wine Branch: master Commit: dd79394ccc7857e8559bc53f8b099e20864786c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd79394ccc7857e8559bc53f8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 18 20:09:26 2016 +0300 d3dx9: D3DXQuaternionSquadSetup should support arguments aliasing. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/math.c | 23 ++++++++++++----------- dlls/d3dx9_36/tests/math.c | 39 +++++++++++++++++++++++---------------- 2 files changed, 35 insertions(+), 27 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 641bece..8f5f5b2 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1587,6 +1587,7 @@ static D3DXQUATERNION add_diff(const D3DXQUATERNION *q1, const D3DXQUATERNION *q void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbout, D3DXQUATERNION *pcout, const D3DXQUATERNION *pq0, const D3DXQUATERNION *pq1, const D3DXQUATERNION *pq2, const D3DXQUATERNION *pq3) { D3DXQUATERNION q, temp1, temp2, temp3, zero; + D3DXQUATERNION aout, cout; TRACE("paout %p, pbout %p, pcout %p, pq0 %p, pq1 %p, pq2 %p, pq3 %p\n", paout, pbout, pcout, pq0, pq1, pq2, pq3); @@ -1595,17 +1596,17 @@ void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbou zero.z = 0.0f; zero.w = 0.0f; - if ( D3DXQuaternionDot(pq0, pq1) < 0.0f ) + if (D3DXQuaternionDot(pq0, pq1) < 0.0f) temp2 = add_diff(&zero, pq0, -1.0f); else temp2 = *pq0; - if ( D3DXQuaternionDot(pq1, pq2) < 0.0f ) - *pcout = add_diff(&zero, pq2, -1.0f); + if (D3DXQuaternionDot(pq1, pq2) < 0.0f) + cout = add_diff(&zero, pq2, -1.0f); else - *pcout = *pq2; + cout = *pq2; - if ( D3DXQuaternionDot(pcout, pq3) < 0.0f ) + if (D3DXQuaternionDot(&cout, pq3) < 0.0f) temp3 = add_diff(&zero, pq3, -1.0f); else temp3 = *pq3; @@ -1613,7 +1614,7 @@ void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbou D3DXQuaternionInverse(&temp1, pq1); D3DXQuaternionMultiply(&temp2, &temp1, &temp2); D3DXQuaternionLn(&temp2, &temp2); - D3DXQuaternionMultiply(&q, &temp1, pcout); + D3DXQuaternionMultiply(&q, &temp1, &cout); D3DXQuaternionLn(&q, &q); temp1 = add_diff(&temp2, &q, 1.0f); temp1.x *= -0.25f; @@ -1621,9 +1622,9 @@ void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbou temp1.z *= -0.25f; temp1.w *= -0.25f; D3DXQuaternionExp(&temp1, &temp1); - D3DXQuaternionMultiply(paout, pq1, &temp1); + D3DXQuaternionMultiply(&aout, pq1, &temp1); - D3DXQuaternionInverse(&temp1, pcout); + D3DXQuaternionInverse(&temp1, &cout); D3DXQuaternionMultiply(&temp2, &temp1, pq1); D3DXQuaternionLn(&temp2, &temp2); D3DXQuaternionMultiply(&q, &temp1, &temp3); @@ -1634,9 +1635,9 @@ void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbou temp1.z *= -0.25f; temp1.w *= -0.25f; D3DXQuaternionExp(&temp1, &temp1); - D3DXQuaternionMultiply(pbout, pcout, &temp1); - - return; + D3DXQuaternionMultiply(pbout, &cout, &temp1); + *paout = aout; + *pcout = cout; } void WINAPI D3DXQuaternionToAxisAngle(const D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index a1b622b..190fb84 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -975,42 +975,49 @@ static void D3DXQuaternionTest(void) s.x = -3.0f; s.y = 4.0f; s.z = -5.0f; s.w = 7.0; t.x = -1111.0f, t.y = 111.0f; t.z = -11.0f; t.w = 1.0f; u.x = 91.0f; u.y = - 82.0f; u.z = 7.3f; u.w = -6.4f; - D3DXQuaternionSquadSetup(&gotquat,&Nq,&Nq1,&r,&s,&t,&u); + D3DXQuaternionSquadSetup(&gotquat, &Nq, &Nq1, &r, &s, &t, &u); expectedquat.x = 7.121285f; expectedquat.y = 2.159964f; expectedquat.z = -3.855094f; expectedquat.w = 5.362844f; - expect_vec4(expectedquat,gotquat); + expect_vec4(expectedquat, gotquat); expectedquat.x = -1113.492920f; expectedquat.y = 82.679260f; expectedquat.z = -6.696645f; expectedquat.w = -4.090050f; - expect_vec4(expectedquat,Nq); + expect_vec4(expectedquat, Nq); expectedquat.x = -1111.0f; expectedquat.y = 111.0f; expectedquat.z = -11.0f; expectedquat.w = 1.0f; - expect_vec4(expectedquat,Nq1); + expect_vec4(expectedquat, Nq1); + gotquat = s; + D3DXQuaternionSquadSetup(&gotquat, &Nq, &Nq1, &r, &gotquat, &t, &u); + expectedquat.x = -1113.492920f; expectedquat.y = 82.679260f; expectedquat.z = -6.696645f; expectedquat.w = -4.090050f; + expect_vec4(expectedquat, Nq); + Nq1 = u; + D3DXQuaternionSquadSetup(&gotquat, &Nq, &Nq1, &r, &s, &t, &Nq1); + expect_vec4(expectedquat, Nq); r.x = 0.2f; r.y = 0.3f; r.z = 1.3f; r.w = -0.6f; s.x = -3.0f; s.y =-2.0f; s.z = 4.0f; s.w = 0.2f; t.x = 0.4f; t.y = 8.3f; t.z = -3.1f; t.w = -2.7f; u.x = 1.1f; u.y = -0.7f; u.z = 9.2f; u.w = 0.0f; - D3DXQuaternionSquadSetup(&gotquat,&Nq,&Nq1,&r,&s,&u,&t); + D3DXQuaternionSquadSetup(&gotquat, &Nq, &Nq1, &r, &s, &u, &t); expectedquat.x = -4.139569f; expectedquat.y = -2.469115f; expectedquat.z = 2.364477f; expectedquat.w = 0.465494f; - expect_vec4(expectedquat,gotquat); + expect_vec4(expectedquat, gotquat); expectedquat.x = 2.342533f; expectedquat.y = 2.365127f; expectedquat.z = 8.628538f; expectedquat.w = -0.898356f; - expect_vec4(expectedquat,Nq); + expect_vec4(expectedquat, Nq); expectedquat.x = 1.1f; expectedquat.y = -0.7f; expectedquat.z = 9.2f; expectedquat.w = 0.0f; - expect_vec4(expectedquat,Nq1); - D3DXQuaternionSquadSetup(&gotquat,&Nq,&Nq1,&r,&s,&t,&u); + expect_vec4(expectedquat, Nq1); + D3DXQuaternionSquadSetup(&gotquat, &Nq, &Nq1, &r, &s, &t, &u); expectedquat.x = -3.754567f; expectedquat.y = -0.586085f; expectedquat.z = 3.815818f; expectedquat.w = -0.198150f; - expect_vec4(expectedquat,gotquat); + expect_vec4(expectedquat, gotquat); expectedquat.x = 0.140773f; expectedquat.y = -8.737090f; expectedquat.z = -0.516593f; expectedquat.w = 3.053942f; - expect_vec4(expectedquat,Nq); + expect_vec4(expectedquat, Nq); expectedquat.x = -0.4f; expectedquat.y = -8.3f; expectedquat.z = 3.1f; expectedquat.w = 2.7f; - expect_vec4(expectedquat,Nq1); + expect_vec4(expectedquat, Nq1); r.x = -1.0f; r.y = 0.0f; r.z = 0.0f; r.w = 0.0f; s.x = 1.0f; s.y =0.0f; s.z = 0.0f; s.w = 0.0f; t.x = 1.0f; t.y = 0.0f; t.z = 0.0f; t.w = 0.0f; u.x = -1.0f; u.y = 0.0f; u.z = 0.0f; u.w = 0.0f; - D3DXQuaternionSquadSetup(&gotquat,&Nq,&Nq1,&r,&s,&t,&u); + D3DXQuaternionSquadSetup(&gotquat, &Nq, &Nq1, &r, &s, &t, &u); expectedquat.x = 1.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f; - expect_vec4(expectedquat,gotquat); + expect_vec4(expectedquat, gotquat); expectedquat.x = 1.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f; - expect_vec4(expectedquat,Nq); + expect_vec4(expectedquat, Nq); expectedquat.x = 1.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f; - expect_vec4(expectedquat,Nq1); + expect_vec4(expectedquat, Nq1); /*_______________D3DXQuaternionToAxisAngle__________________*/ Nq.x = 1.0f/22.0f; Nq.y = 2.0f/22.0f; Nq.z = 4.0f/22.0f; Nq.w = 10.0f/22.0f;

1 0

Paul Gofman : d3dx9/tests: Add test for D3DXSHMultiply3 arguments aliasing.
by Alexandre Julliard April 19, 2016

April 19, 2016

Module: wine Branch: master Commit: ab78cffea7ac676a7041c7d6941b61140cfe005c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab78cffea7ac676a7041c7d69… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 18 20:09:27 2016 +0300 d3dx9/tests: Add test for D3DXSHMultiply3 arguments aliasing. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 190fb84..dddd806 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3108,10 +3108,18 @@ static void test_D3DXSHMultiply3(void) unsigned int i; FLOAT a[20], b[20], c[20]; /* D3DXSHMultiply3 only modifies the first 9 elements of the array */ - const FLOAT expected[20] = - { 7.813913f, 2.256058f, 5.9484005f, 4.970894f, 2.899858f, 3.598946f, - 1.726572f, 5.573538f, 0.622063f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, - 14.0f, 15.0f, 16.0f, 17.0f, 18.0f, 19.0f }; + static const float expected[20] = + { + 7.813913f, 2.256058f, 5.9484005f, 4.970894f, 2.899858f, 3.598946f, + 1.726572f, 5.573538f, 0.622063f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, + 14.0f, 15.0f, 16.0f, 17.0f, 18.0f, 19.0f + }; + static const float expected_aliased[20] = + { + 454.092499f,2.126404f, 5.570401f, 15.330379f, 22.796087f, 43.604126f, + 4.273841f, 175.772034f, 237.672729f, 1.09f, 1.1f, 1.11f, 1.12f, 1.13f, + 1.14f, 1.15f, 1.16f, 1.17f, 1.18f, 1.19f + }; for (i = 0; i < 20; i++) { @@ -3122,7 +3130,14 @@ static void test_D3DXSHMultiply3(void) D3DXSHMultiply3(c, a, b); for (i = 0; i < 20; i++) - ok(relative_error(c[i], expected[i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[i], c[i]); + ok(relative_error(c[i], expected[i]) < admitted_error, + "Expected[%d] = %f, received = %f\n", i, expected[i], c[i]); + for (i = 0; i < 20; i++) + c[i] = a[i]; + D3DXSHMultiply3(c, c, b); + for (i = 0; i < 20; i++) + ok(relative_error(c[i], expected_aliased[i]) < admitted_error, + "Expected[%d] = %f, received = %f\n", i, expected[i], c[i]); } static void test_D3DXSHMultiply4(void)

1 0

Francois Gouget : gdi32/tests: A spelling fix in a comment.
by Alexandre Julliard April 19, 2016

April 19, 2016

Module: wine Branch: master Commit: bf5508f9e0f80a9675b3e772b262995595b7142c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5508f9e0f80a9675b3e772b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 19 06:12:52 2016 +0200 gdi32/tests: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 68ac425..b9e7522 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3656,7 +3656,7 @@ static void test_emf_GradientFill(void) ok( mf != 0, "CreateEnhMetaFileA error %d\n", GetLastError() ); /* Don't test the GRADIENT_FILL_RECT_ modes since a Windows bug - * means it allocates three mesh indicies rather than two per + * means it allocates three mesh indices rather than two per * rectangle. This results in uninitialised values being written * to the EMF which is rather difficult to test against. *

1 0

Józef Kucia : wined3d: Merge codepaths in surface_download_data().
by Alexandre Julliard April 19, 2016

April 19, 2016

Module: wine Branch: master Commit: cffe58c75dcbefd4c8ccde28796b7a46f5a013fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cffe58c75dcbefd4c8ccde287… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 19 00:01:27 2016 +0200 wined3d: Merge codepaths in surface_download_data(). 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/surface.c | 214 +++++++++++++++++++++++-------------------------- 1 file changed, 100 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cffe58c75dcbefd4c8ccd…

1 0

Paul Gofman : d3dx9: Implement setting named shader constants in effect.
by Alexandre Julliard April 19, 2016

April 19, 2016

Module: wine Branch: master Commit: 453d9f7bce92a1862ca101c115902b2bd6fb07d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=453d9f7bce92a1862ca101c11… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 18 19:59:48 2016 +0300 d3dx9: Implement setting named shader constants in effect. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 2 + dlls/d3dx9_36/effect.c | 60 +++++++++++++++++++--- dlls/d3dx9_36/preshader.c | 113 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/effect.c | 4 +- 4 files changed, 171 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=453d9f7bce92a1862ca10…

1 0

Nikolay Sivov : dwrite: Fix IDWriteFactory3 methods order.
by Alexandre Julliard April 19, 2016

April 19, 2016

Module: wine Branch: master Commit: 897c1d03fac13f6d0d7f32f85951d09d3bb3a42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=897c1d03fac13f6d0d7f32f85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 19 09:39:27 2016 +0300 dwrite: Fix IDWriteFactory3 methods order. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 16 ++++++++-------- dlls/dwrite/tests/font.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ include/dwrite_3.idl | 12 +++++++----- 3 files changed, 64 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index bf0c41d..de60147 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1261,22 +1261,22 @@ static HRESULT WINAPI dwritefactory3_CreateCustomRenderingParams(IDWriteFactory3 gridfit_mode, params); } -static HRESULT WINAPI dwritefactory3_CreateFontFaceReference(IDWriteFactory3 *iface, WCHAR const *path, FILETIME const *writetime, - UINT32 index, DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFaceReference **reference) +static HRESULT WINAPI dwritefactory3_CreateFontFaceReference_(IDWriteFactory3 *iface, IDWriteFontFile *file, UINT32 index, + DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFaceReference **reference) { struct dwritefactory *This = impl_from_IDWriteFactory3(iface); - FIXME("(%p)->(%s %p %u %x, %p): stub\n", This, debugstr_w(path), writetime, index, simulations, reference); + FIXME("(%p)->(%p %u %x %p): stub\n", This, file, index, simulations, reference); return E_NOTIMPL; } -static HRESULT WINAPI dwritefactory3_CreateFontFaceReference_(IDWriteFactory3 *iface, IDWriteFontFile *file, UINT32 index, - DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFaceReference **reference) +static HRESULT WINAPI dwritefactory3_CreateFontFaceReference(IDWriteFactory3 *iface, WCHAR const *path, FILETIME const *writetime, + UINT32 index, DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFaceReference **reference) { struct dwritefactory *This = impl_from_IDWriteFactory3(iface); - FIXME("(%p)->(%p %u %x %p): stub\n", This, file, index, simulations, reference); + FIXME("(%p)->(%s %p %u %x, %p): stub\n", This, debugstr_w(path), writetime, index, simulations, reference); return E_NOTIMPL; } @@ -1362,8 +1362,8 @@ static const struct IDWriteFactory3Vtbl dwritefactoryvtbl = { dwritefactory2_CreateGlyphRunAnalysis, dwritefactory3_CreateGlyphRunAnalysis, dwritefactory3_CreateCustomRenderingParams, - dwritefactory3_CreateFontFaceReference, dwritefactory3_CreateFontFaceReference_, + dwritefactory3_CreateFontFaceReference, dwritefactory3_GetSystemFontSet, dwritefactory3_CreateFontSetBuilder, dwritefactory3_CreateFontCollectionFromFontSet, @@ -1419,8 +1419,8 @@ static const struct IDWriteFactory3Vtbl shareddwritefactoryvtbl = { dwritefactory2_CreateGlyphRunAnalysis, dwritefactory3_CreateGlyphRunAnalysis, dwritefactory3_CreateCustomRenderingParams, - dwritefactory3_CreateFontFaceReference, dwritefactory3_CreateFontFaceReference_, + dwritefactory3_CreateFontFaceReference, dwritefactory3_GetSystemFontSet, dwritefactory3_CreateFontSetBuilder, dwritefactory3_CreateFontCollectionFromFontSet, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 515ece4..3c1f332 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5792,6 +5792,54 @@ static void test_HasCharacter(void) IDWriteFactory_Release(factory); } +static void test_CreateFontFaceReference(void) +{ + static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + IDWriteFontFaceReference *ref; + IDWriteFactory3 *factory3; + IDWriteFactory *factory; + UINT32 index; + WCHAR *path; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory3, (void**)&factory3); + IDWriteFactory_Release(factory); + if (FAILED(hr)) { + win_skip("CreateFontFaceReference() is not supported.\n"); + return; + } + + path = create_testfontfile(test_fontfile); + + hr = IDWriteFactory3_CreateFontFaceReference(factory3, NULL, NULL, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref); +todo_wine + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* test file is not a collection, but reference could still be created */ + hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 1, DWRITE_FONT_SIMULATIONS_NONE, &ref); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) { + index = IDWriteFontFaceReference_GetFontFaceIndex(ref); + ok(index == 1, "got %u\n", index); +} + /* path however has to be valid */ + hr = IDWriteFactory3_CreateFontFaceReference(factory3, dummyW, NULL, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref); +todo_wine + ok(hr == DWRITE_E_FILENOTFOUND, "got 0x%08x\n", hr); + + hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) + IDWriteFontFaceReference_Release(ref); + + IDWriteFactory3_Release(factory3); + DELETE_FONTFILE(path); +} + START_TEST(font) { IDWriteFactory *factory; @@ -5846,6 +5894,7 @@ START_TEST(font) test_GetPaletteEntries(); test_TranslateColorGlyphRun(); test_HasCharacter(); + test_CreateFontFaceReference(); IDWriteFactory_Release(factory); } diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index b69f29a..bf16800 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -282,15 +282,17 @@ interface IDWriteFactory3 : IDWriteFactory2 DWRITE_GRID_FIT_MODE gridfit_mode, IDWriteRenderingParams3 **params); - HRESULT CreateFontFaceReference( - WCHAR const *path, - FILETIME const *writetime, + /* CreateFontFaceReference methods are listed in reversed order to make + resulting vtable order compatible. */ + HRESULT CreateFontFaceReference_( + IDWriteFontFile *file, UINT32 index, DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFaceReference **reference); - HRESULT CreateFontFaceReference_( - IDWriteFontFile *file, + HRESULT CreateFontFaceReference( + WCHAR const *path, + FILETIME const *writetime, UINT32 index, DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFaceReference **reference);

1 0