wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Matteo Bruni : d3dx9: Don't complain when overwriting effect object id 0.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: e7021c6a036be1aaa6bebc5b01f8c780f4b7e517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7021c6a036be1aaa6bebc5b0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Apr 17 19:15:17 2016 +0200 d3dx9: Don't complain when overwriting effect object id 0. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5753683..aa939a1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4764,10 +4764,17 @@ static HRESULT d3dx9_parse_name(char **name, const char *ptr) return D3D_OK; } -static HRESULT d3dx9_copy_data(struct d3dx_object *object, const char **ptr) +static HRESULT d3dx9_copy_data(struct d3dx9_base_effect *base, unsigned int object_id, const char **ptr) { + struct d3dx_object *object = &base->objects[object_id]; + if (object->size || object->data) - FIXME("Object already initialized!\n"); + { + if (object_id) + FIXME("Overwriting object id %u!\n", object_id); + else + TRACE("Overwriting object id 0.\n"); + } read_dword(ptr, &object->size); TRACE("Data size: %#x\n", object->size); @@ -5570,7 +5577,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case D3DXPT_VERTEXSHADER: case D3DXPT_PIXELSHADER: state->type = ST_CONSTANT; - if (FAILED(hr = d3dx9_copy_data(&base->objects[param->object_id], ptr))) + if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; if (object->data) @@ -5586,7 +5593,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case D3DXPT_FLOAT: case D3DXPT_STRING: state->type = ST_FXLC; - if (FAILED(hr = d3dx9_copy_data(&base->objects[param->object_id], ptr))) + if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; d3dx_create_param_eval(base, object->data, object->size, param->type, &param->param_eval); break; @@ -5599,7 +5606,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case 1: state->type = ST_PARAMETER; - if (FAILED(hr = d3dx9_copy_data(&base->objects[param->object_id], ptr))) + if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; TRACE("Looking for parameter %s.\n", debugstr_a(object->data)); @@ -5627,7 +5634,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case 2: state->type = ST_ARRAY_SELECTOR; - if (FAILED(hr = d3dx9_copy_data(object, ptr))) + if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; hr = d3dx9_parse_array_selector(base, param); break; @@ -5727,7 +5734,7 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da read_dword(&ptr, &id); TRACE("Id: %u\n", id); - if (FAILED(hr = d3dx9_copy_data(&base->objects[id], &ptr))) + if (FAILED(hr = d3dx9_copy_data(base, id, &ptr))) goto err_out; if (base->objects[id].data)

1 0

Francois Gouget : d3dx9_36/tests: Fix an unknown spelling error in the shader tests.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: a6745afc540d4a19d96ebf92c22262efe49fb8dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6745afc540d4a19d96ebf92c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 17 20:05:32 2016 +0200 d3dx9_36/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/d3dx9_36/tests/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 694540c..4a7ae67 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -554,7 +554,7 @@ static void test_get_shader_constant_table_ex(void) ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); hr = ID3DXConstantTable_GetConstantDesc(constant_table, constant, &constant_desc, NULL); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - hr = ID3DXConstantTable_GetConstantDesc(constant_table, "Constant unknow", &constant_desc, &nb); + hr = ID3DXConstantTable_GetConstantDesc(constant_table, "Constant unknown", &constant_desc, &nb); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); hr = ID3DXConstantTable_GetConstantDesc(constant_table, "Constant3", &constant_desc, &nb); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr);

1 0

Francois Gouget : d3dxof/tests: Fix an unknown spelling error in the shader tests.
by Alexandre Julliard 18 Apr '16

18 Apr '16

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

Francois Gouget : d3dcompiler_43/tests: Fix a needless spelling error in a test.
by Alexandre Julliard 18 Apr '16

18 Apr '16

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 18 Apr '16

18 Apr '16

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 18 Apr '16

18 Apr '16

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: Get rid of redundant temporary variable in D3DXQuaternionInverse.
by Alexandre Julliard 18 Apr '16

18 Apr '16

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

Paul Gofman : d3dx9: Add test for D3DXPlaneFromPointNormal arguments aliasing.
by Alexandre Julliard 18 Apr '16

18 Apr '16

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

Paul Gofman : d3dx9: Implement array selectors in effect.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 4620bb80b05a933b59e5c1dd62df2f93793d2b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4620bb80b05a933b59e5c1dd6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 14 13:30:54 2016 +0300 d3dx9: Implement array selectors 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/effect.c | 84 ++++++++++++++++++++++++++------------------ dlls/d3dx9_36/tests/effect.c | 6 ++-- 2 files changed, 53 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4620bb80b05a933b59e5c…

1 0

Paul Gofman : d3dx9: Add basic opcodes to preshader.
by Alexandre Julliard 18 Apr '16

18 Apr '16

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

← Newer
1
...
31
32
33
34
35
36
37
...
75
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 April 2016