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

Paul Gofman : d3dx9: Get rid of redundant temporary variable in D3DXQuaternionInverse.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: a67b43c1bed7aa5b2df0529d2358bd1752cc18a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a67b43c1bed7aa5b2df0529d2… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 14 15:10:12 2016 +0300 d3dx9: Get rid of redundant temporary variable in D3DXQuaternionInverse. 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 | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 394ff05..1808782 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1376,19 +1376,16 @@ D3DXQUATERNION * WINAPI D3DXQuaternionExp(D3DXQUATERNION *out, const D3DXQUATERN D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, const D3DXQUATERNION *pq) { - D3DXQUATERNION out; FLOAT norm; TRACE("pout %p, pq %p\n", pout, pq); norm = D3DXQuaternionLengthSq(pq); - out.x = -pq->x / norm; - out.y = -pq->y / norm; - out.z = -pq->z / norm; - out.w = pq->w / norm; - - *pout =out; + pout->x = -pq->x / norm; + pout->y = -pq->y / norm; + pout->z = -pq->z / norm; + pout->w = pq->w / norm; return pout; }

1 0

Caron Wills : wined3d: Add Nvidia GeForce 840M.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: f8d6eee32a612443d460c34b24c27ab7646da811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d6eee32a612443d460c34b2… Author: Caron Wills <caron(a)codeweavers.com> Date: Fri Apr 15 18:10:42 2016 +0000 wined3d: Add Nvidia GeForce 840M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8358930..8c3ccf0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1287,6 +1287,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_840M, "NVIDIA GeForce 840M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1751,6 +1752,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GeForce 840M", CARD_NVIDIA_GEFORCE_840M}, /* GeForce 800 - mobile */ {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ @@ -2111,6 +2113,7 @@ cards_nvidia_mesa[] = { /* Maxwell */ {"NV124", CARD_NVIDIA_GEFORCE_GTX970}, + {"NV118", CARD_NVIDIA_GEFORCE_840M}, {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 24515da..f51d7e2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1796,6 +1796,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, CARD_NVIDIA_GEFORCE_820M = 0x0fed, CARD_NVIDIA_GEFORCE_830M = 0x1340, + CARD_NVIDIA_GEFORCE_840M = 0x1341, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

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

April 18, 2016

Module: wine Branch: master Commit: 2f386e7e490ac88edb503044252ad4559358974e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f386e7e490ac88edb5030442… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 17 19:07:52 2016 +0200 wined3d: Use the texture dimension helpers in draw_textured_quad(). 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 cba70a4..dd3a27e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -289,7 +289,9 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 struct wined3d_texture *texture = src_surface->container; struct blt_info info; - surface_get_blt_info(src_surface->texture_target, src_rect, src_surface->pow2Width, src_surface->pow2Height, &info); + surface_get_blt_info(src_surface->texture_target, src_rect, + wined3d_texture_get_level_pow2_width(texture, src_surface->texture_level), + wined3d_texture_get_level_pow2_height(texture, src_surface->texture_level), &info); gl_info->gl_ops.gl.p_glEnable(info.bind_target); checkGLcall("glEnable(bind_target)");

1 0

Francois Gouget : d3dcompiler_43/tests: Fix a needless spelling error in a test.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 304bbbeaa7cdcc1b6b442dded4e3a8d64c60bfbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=304bbbeaa7cdcc1b6b442dded… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 15 14:27:14 2016 +0200 d3dcompiler_43/tests: Fix a needless spelling error in a test. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/reflection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 70c062e..9d77d47 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1296,7 +1296,7 @@ static void test_reflection_constant_buffer(void) ok(t11_valid != t11_dummy && t11_valid, "GetType failed\n"); /* reflection calls */ - cb11 = ref11->lpVtbl->GetConstantBufferByName(ref11, "invaild"); + cb11 = ref11->lpVtbl->GetConstantBufferByName(ref11, "invalid"); ok(cb11_dummy == cb11, "GetConstantBufferByName failed, got %p, expected %p\n", cb11, cb11_dummy); cb11 = ref11->lpVtbl->GetConstantBufferByName(ref11, NULL); @@ -1305,7 +1305,7 @@ static void test_reflection_constant_buffer(void) v11 = ref11->lpVtbl->GetVariableByName(ref11, NULL); ok(v11_dummy == v11, "GetVariableByIndex failed, got %p, expected %p\n", v11, v11_dummy); - v11 = ref11->lpVtbl->GetVariableByName(ref11, "invaild"); + v11 = ref11->lpVtbl->GetVariableByName(ref11, "invalid"); ok(v11_dummy == v11, "GetVariableByName failed, got %p, expected %p\n", v11, v11_dummy); v11 = ref11->lpVtbl->GetVariableByName(ref11, "a");

1 0

Paul Gofman : d3dx9: Add test for D3DXVec2TransformCoord arguments aliasing.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 61b09f3fc78d291a5d37f7006bc28f8674992458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b09f3fc78d291a5d37f7006… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 14 15:10:15 2016 +0300 d3dx9: Add test for D3DXVec2TransformCoord 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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 46f90dd..a1b622b 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1194,8 +1194,11 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2TransformCoord_______________________*/ expectedvec.x = 0.6f; expectedvec.y = 11.0f/15.0f; - D3DXVec2TransformCoord(&gotvec,&u,&mat); - expect_vec(expectedvec,gotvec); + D3DXVec2TransformCoord(&gotvec, &u, &mat); + expect_vec(expectedvec, gotvec); + gotvec.x = u.x; gotvec.y = u.y; + D3DXVec2TransformCoord(&gotvec, (D3DXVECTOR2 *)&gotvec, &mat); + expect_vec(expectedvec, gotvec); /*_______________D3DXVec2TransformNormal______________________*/ expectedvec.x = 23.0f; expectedvec.y = 30.0f;

1 0

Paul Gofman : d3dx9: D3DXVec2Transform should support arguments aliasing.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: bb9a2e6714668398e01ac045978f37a8ee490eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9a2e6714668398e01ac0459… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 14 15:10:14 2016 +0300 d3dx9: D3DXVec2Transform 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 | 11 +++++++---- dlls/d3dx9_36/tests/math.c | 7 +++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 1808782..641bece 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1712,12 +1712,15 @@ D3DXVECTOR2* WINAPI D3DXVec2Normalize(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv) D3DXVECTOR4* WINAPI D3DXVec2Transform(D3DXVECTOR4 *pout, const D3DXVECTOR2 *pv, const D3DXMATRIX *pm) { + D3DXVECTOR4 out; + TRACE("pout %p, pv %p, pm %p\n", pout, pv, pm); - pout->x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[3][0]; - pout->y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[3][1]; - pout->z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[3][2]; - pout->w = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[3][3]; + out.x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[3][0]; + out.y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[3][1]; + out.z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[3][2]; + out.w = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[3][3]; + *pout = out; return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 4ac0a31..46f90dd 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1186,8 +1186,11 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2Transform_______________________*/ expectedtrans.x = 36.0f; expectedtrans.y = 44.0f; expectedtrans.z = 52.0f; expectedtrans.w = 60.0f; - D3DXVec2Transform(&gottrans,&u,&mat); - expect_vec4(expectedtrans,gottrans); + D3DXVec2Transform(&gottrans, &u, &mat); + expect_vec4(expectedtrans, gottrans); + gottrans.x = u.x; gottrans.y = u.y; + D3DXVec2Transform(&gottrans, (D3DXVECTOR2 *)&gottrans, &mat); + expect_vec4(expectedtrans, gottrans); /*_______________D3DXVec2TransformCoord_______________________*/ expectedvec.x = 0.6f; expectedvec.y = 11.0f/15.0f;

1 0

Paul Gofman : d3dx9: Add basic opcodes to preshader.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 58d80d90a54a9d3be853e549ae828edc411f2649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d80d90a54a9d3be853e549a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Sun Apr 17 18:59:45 2016 +0200 d3dx9: Add basic opcodes to preshader. 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/preshader.c | 64 ++++++++++++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/tests/effect.c | 56 +++++++++++++++++++------------------- 2 files changed, 90 insertions(+), 30 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index fba9973..b831be1 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -29,11 +29,57 @@ enum pres_ops { PRESHADER_OP_NOP, PRESHADER_OP_MOV, + PRESHADER_OP_ADD, + PRESHADER_OP_MUL, + PRESHADER_OP_DOT, + PRESHADER_OP_NEG, + PRESHADER_OP_RCP, + PRESHADER_OP_LT, + PRESHADER_OP_FRC, + PRESHADER_OP_MIN, + PRESHADER_OP_MAX, + PRESHADER_OP_GE, + PRESHADER_OP_CMP, + PRESHADER_OP_SIN, + PRESHADER_OP_COS, + PRESHADER_OP_RSQ, }; -typedef double (*pres_op_func)(double *args, int ncomp); +typedef double (*pres_op_func)(double *args, int n); -static double pres_mov(double *args, int ncomp) {return args[0];} +static double pres_mov(double *args, int n) {return args[0];} +static double pres_add(double *args, int n) {return args[0] + args[1];} +static double pres_mul(double *args, int n) {return args[0] * args[1];} +static double pres_dot(double *args, int n) +{ + int i; + double sum; + + sum = 0.0; + for (i = 0; i < n; ++i) + sum += args[i] * args[i + n]; + return sum; +} +static double pres_neg(double *args, int n) {return -args[0];} +static double pres_rcp(double *args, int n) {return 1.0 / args[0];} +static double pres_lt(double *args, int n) {return args[0] < args[1] ? 1.0 : 0.0;} +static double pres_ge(double *args, int n) {return args[0] >= args[1] ? 1.0 : 0.0;} +static double pres_frc(double *args, int n) {return args[0] - floor(args[0]);} +static double pres_min(double *args, int n) {return fmin(args[0], args[1]);} +static double pres_max(double *args, int n) {return fmax(args[0], args[1]);} +static double pres_cmp(double *args, int n) {return args[0] < 0.0 ? args[2] : args[1];} +static double pres_sin(double *args, int n) {return sin(args[0]);} +static double pres_cos(double *args, int n) {return cos(args[0]);} +static double pres_rsq(double *args, int n) +{ + double v; + + v = fabs(args[0]); + if (v == 0.0) + return INFINITY; + else + return 1.0 / sqrt(v); +} #define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_SHIFT 20 @@ -59,6 +105,20 @@ static const struct op_info pres_op_info[] = { {0x000, "nop", 0, 0, NULL }, /* PRESHADER_OP_NOP */ {0x100, "mov", 1, 0, pres_mov}, /* PRESHADER_OP_MOV */ + {0x204, "add", 2, 0, pres_add}, /* PRESHADER_OP_ADD */ + {0x205, "mul", 2, 0, pres_mul}, /* PRESHADER_OP_MUL */ + {0x500, "dot", 2, 1, pres_dot}, /* PRESHADER_OP_DOT */ + {0x101, "neg", 1, 0, pres_neg}, /* PRESHADER_OP_NEG */ + {0x103, "rcp", 1, 0, pres_rcp}, /* PRESHADER_OP_RCP */ + {0x202, "lt", 2, 0, pres_lt }, /* PRESHADER_OP_LT */ + {0x104, "frc", 1, 0, pres_frc}, /* PRESHADER_OP_FRC */ + {0x200, "min", 2, 0, pres_min}, /* PRESHADER_OP_MIN */ + {0x201, "max", 2, 0, pres_max}, /* PRESHADER_OP_MAX */ + {0x203, "ge", 2, 0, pres_ge }, /* PRESHADER_OP_GE */ + {0x300, "cmp", 3, 0, pres_cmp}, /* PRESHADER_OP_CMP */ + {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ + {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ + {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ }; enum pres_value_type diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 4f017bd..99f0d46 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3692,37 +3692,34 @@ static void test_effect_preshader(IDirect3DDevice9 *device) const char *comment; BOOL todo[4]; unsigned int result[4]; + unsigned int ulps; } test_effect_preshader_op_results[] = { - {"1 / op", { TRUE, TRUE, TRUE, TRUE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, + {"1 / op", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, + {"rsq", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0x7f800000, 0x3f2c985c, 0x1f800001}, 1}, + {"mul", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0x40d33334, 0x7f800000}}, + {"add", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x40000000, 0xc0a66666, 0x7f7fffff}}, + {"lt", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x3f800000, 0x00000000, 0x00000000}}, + {"ge", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x00000000, 0x3f800000, 0x3f800000}}, + {"neg", {FALSE, FALSE, FALSE, FALSE}, {0x80000000, 0x00000000, 0x400ccccd, 0xff7fffff}}, + {"rcp", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, + {"frac", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x00000000, 0x3f4ccccc, 0x00000000}}, + {"min", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0xc0400000, 0x40800000}}, + {"max", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x40000000, 0xc00ccccd, 0x7f7fffff}}, #if __x86_64__ - {"rsq", { TRUE, TRUE, TRUE, TRUE}, {0x7f800000, 0x7f800000, 0x3f2c985d, 0x1f800000}}, + {"sin", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0xbf0599b3}}, + {"cos", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0x3f5a5f96}}, #else - {"rsq", { TRUE, TRUE, TRUE, TRUE}, {0x7f800000, 0x7f800000, 0x3f2c985c, 0x1f800001}}, + {"sin", {FALSE, FALSE, FALSE, TRUE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0x3f792dc4}}, + {"cos", {FALSE, FALSE, FALSE, TRUE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0xbe6acefc}}, #endif - {"mul", { TRUE, TRUE, TRUE, TRUE}, {0x00000000, 0x80000000, 0x40d33334, 0x7f800000}}, - {"add", {FALSE, TRUE, TRUE, TRUE}, {0x3f800000, 0x40000000, 0xc0a66666, 0x7f7fffff}}, - {"lt", {FALSE, FALSE, TRUE, FALSE}, {0x3f800000, 0x3f800000, 0x00000000, 0x00000000}}, - {"ge", { TRUE, TRUE, FALSE, TRUE}, {0x00000000, 0x00000000, 0x3f800000, 0x3f800000}}, - {"neg", { TRUE, TRUE, TRUE, TRUE}, {0x80000000, 0x00000000, 0x400ccccd, 0xff7fffff}}, - {"rcp", { TRUE, TRUE, TRUE, TRUE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, - {"frac", {FALSE, FALSE, TRUE, FALSE}, {0x00000000, 0x00000000, 0x3f4ccccc, 0x00000000}}, - {"min", {FALSE, TRUE, TRUE, TRUE}, {0x00000000, 0x80000000, 0xc0400000, 0x40800000}}, - {"max", { TRUE, TRUE, TRUE, TRUE}, {0x3f800000, 0x40000000, 0xc00ccccd, 0x7f7fffff}}, + {"den mul",{FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbb94f209, 0x000051ec}}, + {"dot", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x7f800000, 0x41f00000, 0x00000000}}, #if __x86_64__ - {"sin", {FALSE, TRUE, TRUE, TRUE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0xbf0599b3}}, - {"cos", { TRUE, TRUE, TRUE, TRUE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0x3f5a5f96}}, + {"prec", {FALSE, FALSE, TRUE, FALSE}, {0x2b8cbccc, 0x2c0cbccc, 0xac531800, 0x00000000}} #else - {"sin", {FALSE, TRUE, TRUE, TRUE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0x3f792dc4}}, - {"cos", { TRUE, TRUE, TRUE, TRUE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0xbe6acefc}}, -#endif - {"den mul",{ TRUE, TRUE, TRUE, TRUE}, {0x7f800000, 0xff800000, 0xbb94f209, 0x000051ec}}, - {"dot", {FALSE, TRUE, TRUE, FALSE}, {0x00000000, 0x7f800000, 0x41f00000, 0x00000000}}, -#if __x86_64__ - {"prec", { TRUE, TRUE, TRUE, FALSE}, {0x2b8cbccc, 0x2c0cbccc, 0xac531800, 0x00000000}} -#else - {"prec", { TRUE, TRUE, FALSE, FALSE}, {0x2b8cbccc, 0x2c0cbccc, 0x00000000, 0x00000000}} + {"prec", {FALSE, FALSE, FALSE, FALSE}, {0x2b8cbccc, 0x2c0cbccc, 0x00000000, 0x00000000}} #endif }; #define TEST_EFFECT_PRES_NFLOATV ARRAY_SIZE(test_effect_preshader_fconstsv) @@ -3789,7 +3786,7 @@ static void test_effect_preshader(IDirect3DDevice9 *device) ok(hr == D3D_OK, "SetVector failed, hr %#x.\n", hr); hr = effect->lpVtbl->BeginPass(effect, 0); - todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 0, &fdata[0].x, TEST_EFFECT_PRES_NFLOATV); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -3828,17 +3825,20 @@ static void test_effect_preshader(IDirect3DDevice9 *device) for (i = 0; i < TEST_EFFECT_PRES_NOPTESTS; ++i) { - unsigned int *v; + float *v; hr = IDirect3DDevice9_GetLight(device, i % 8, &light); - v = i < 8 ? (unsigned int *)&light.Diffuse : (unsigned int *)&light.Ambient; + v = i < 8 ? &light.Diffuse.r : &light.Ambient.r; ok(hr == D3D_OK, "Got result %#x.\n", hr); for (j = 0; j < 4; ++j) + { todo_wine_if(test_effect_preshader_op_results[i].todo[j]) - ok(v[j] == test_effect_preshader_op_results[i].result[j], + ok(compare_float(v[j], ((float *)test_effect_preshader_op_results[i].result)[j], + test_effect_preshader_op_results[i].ulps), "Operation %s, component %u, expected %#x, got %#x (%g).\n", test_effect_preshader_op_results[i].comment, j, - test_effect_preshader_op_results[i].result[j], v[j], ((float *)v)[j]); + test_effect_preshader_op_results[i].result[j], ((unsigned int *)v)[j], v[j]); + } } hr = effect->lpVtbl->EndPass(effect);

1 0

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

April 18, 2016

Module: wine Branch: master Commit: cb127e7145a0a0bd508cd7cc51468502f2fe567e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb127e7145a0a0bd508cd7cc5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 17 19:07:50 2016 +0200 wined3d: Use the texture dimension helpers in device_clear_render_targets(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b1d8631..149234b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -343,8 +343,10 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c else { render_offscreen = TRUE; - drawable_width = depth_stencil->pow2Width; - drawable_height = depth_stencil->pow2Height; + drawable_width = wined3d_texture_get_level_pow2_width(depth_stencil->container, + depth_stencil->texture_level); + drawable_height = wined3d_texture_get_level_pow2_height(depth_stencil->container, + depth_stencil->texture_level); } if (depth_stencil && render_offscreen)

1 0

Francois Gouget : d3dxof/tests: Fix an unknown spelling error in the shader tests.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 50215415f1969b9ef7319a3a685e6daa61f98209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50215415f1969b9ef7319a3a6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 17 20:05:38 2016 +0200 d3dxof/tests: Fix an unknown spelling error in the shader tests. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/tests/d3dxof.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 0573e4a..29a3868 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -536,7 +536,7 @@ static void test_CreateEnumObject(void) ok(*((WORD*)pdata) == 3, "Retrieved data is wrong (%u instead of 3)\n", *((WORD*)pdata)); /* Try to get not existing member (szMember == "unknown") */ - hr = IDirectXFileData_GetData(lpdxfd, "unknow", &size, (void**)&pdata); + hr = IDirectXFileData_GetData(lpdxfd, "unknown", &size, (void**)&pdata); ok(hr == DXFILEERR_BADDATAREFERENCE, "IDirectXFileData_GetData: %x\n", hr); ref = IDirectXFileEnumObject_Release(lpdxfeo);

1 0

Paul Gofman : d3dx9: Add test for D3DXPlaneFromPointNormal arguments aliasing.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 97bbf747c0a2400c49ef053d79b74733aab1e66d URL: http://source.winehq.org/git/wine.git/?a=commit;h=97bbf747c0a2400c49ef053d7… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 14 15:10:11 2016 +0300 d3dx9: Add test for D3DXPlaneFromPointNormal 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 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 0fe6796..4ac0a31 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -609,7 +609,14 @@ static void D3DXPlaneTest(void) vec1.x = 11.0f; vec1.y = 13.0f; vec1.z = 15.0f; vec2.x = 17.0f; vec2.y = 31.0f; vec2.z = 24.0f; expectedplane.a = 17.0f; expectedplane.b = 31.0f; expectedplane.c = 24.0f; expectedplane.d = -950.0f; - D3DXPlaneFromPointNormal(&gotplane,&vec1,&vec2); + D3DXPlaneFromPointNormal(&gotplane, &vec1, &vec2); + expect_plane(expectedplane, gotplane); + gotplane.a = vec2.x; gotplane.b = vec2.y; gotplane.c = vec2.z; + D3DXPlaneFromPointNormal(&gotplane, &vec1, (D3DXVECTOR3 *)&gotplane); + expect_plane(expectedplane, gotplane); + gotplane.a = vec1.x; gotplane.b = vec1.y; gotplane.c = vec1.z; + expectedplane.d = -1826.0f; + D3DXPlaneFromPointNormal(&gotplane, (D3DXVECTOR3 *)&gotplane, &vec2); expect_plane(expectedplane, gotplane); /*_______________D3DXPlaneFromPoints_______*/

1 0