From f8690a6bdad79ab66de4de37fd8a1e11c0a631ff Mon Sep 17 00:00:00 2001 From: David Adam Date: Thu, 21 Oct 2010 15:01:24 +0200 Subject: [PATCH] ddraw: Remove a useless function. --- dlls/ddraw/ddraw_private.h | 2 -- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/utils.c | 24 ------------------------ 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f9b9a4830f6..1518db2a615 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -653,8 +653,6 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel) DECLSPEC_HIDDEN; * IDirect3DExecuteBuffer isn't in WineD3D */ void multiply_matrix(LPD3DMATRIX dest, const D3DMATRIX *src1, const D3DMATRIX *src2) DECLSPEC_HIDDEN; -void multiply_matrix_D3D_way(LPD3DMATRIX result, const D3DMATRIX *m1, const D3DMATRIX *m2) DECLSPEC_HIDDEN; - /* Helper function in main.c */ BOOL LoadWineD3D(void) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7976ecbec07..a7eb2ddabca 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4502,11 +4502,11 @@ IDirect3DDeviceImpl_7_ComputeSphereVisibility(IDirect3DDevice7 *iface, if ( hr != DD_OK ) return DDERR_INVALIDPARAMS; hr = IDirect3DDeviceImpl_7_GetTransform(iface, D3DTRANSFORMSTATE_VIEW, &temp); if ( hr != DD_OK ) return DDERR_INVALIDPARAMS; - multiply_matrix_D3D_way(&m, &m, &temp); + multiply_matrix(&m, &temp, &m); hr = IDirect3DDeviceImpl_7_GetTransform(iface, D3DTRANSFORMSTATE_PROJECTION, &temp); if ( hr != DD_OK ) return DDERR_INVALIDPARAMS; - multiply_matrix_D3D_way(&m, &m, &temp); + multiply_matrix(&m, &temp, &m); /* Left plane */ vec[0].u1.x = m._14 + m._11; diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 9d1b8925dc9..c07fbe6967a 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -1172,30 +1172,6 @@ multiply_matrix(D3DMATRIX *dest, memcpy(dest, &temp, 16 * sizeof(D3DVALUE)); } -void multiply_matrix_D3D_way(D3DMATRIX* result, const D3DMATRIX *m1, const D3DMATRIX *m2) -{ - D3DMATRIX temp; - - temp._11 = m1->_11 * m2->_11 + m1->_12 * m2->_21 + m1->_13 * m2->_31 + m1->_14 * m2->_41; - temp._12 = m1->_11 * m2->_12 + m1->_12 * m2->_22 + m1->_13 * m2->_32 + m1->_14 * m2->_42; - temp._13 = m1->_11 * m2->_13 + m1->_12 * m2->_23 + m1->_13 * m2->_33 + m1->_14 * m2->_43; - temp._14 = m1->_11 * m2->_14 + m1->_12 * m2->_24 + m1->_13 * m2->_34 + m1->_14 * m2->_44; - temp._21 = m1->_21 * m2->_11 + m1->_22 * m2->_21 + m1->_23 * m2->_31 + m1->_24 * m2->_41; - temp._22 = m1->_21 * m2->_12 + m1->_22 * m2->_22 + m1->_23 * m2->_32 + m1->_24 * m2->_42; - temp._23 = m1->_21 * m2->_13 + m1->_22 * m2->_23 + m1->_23 * m2->_33 + m1->_24 * m2->_43; - temp._24 = m1->_21 * m2->_14 + m1->_22 * m2->_24 + m1->_23 * m2->_34 + m1->_24 * m2->_44; - temp._31 = m1->_31 * m2->_11 + m1->_32 * m2->_21 + m1->_33 * m2->_31 + m1->_34 * m2->_41; - temp._32 = m1->_31 * m2->_12 + m1->_32 * m2->_22 + m1->_33 * m2->_32 + m1->_34 * m2->_42; - temp._33 = m1->_31 * m2->_13 + m1->_32 * m2->_23 + m1->_33 * m2->_33 + m1->_34 * m2->_43; - temp._34 = m1->_31 * m2->_14 + m1->_32 * m2->_24 + m1->_33 * m2->_34 + m1->_34 * m2->_44; - temp._41 = m1->_41 * m2->_11 + m1->_42 * m2->_21 + m1->_43 * m2->_31 + m1->_44 * m2->_41; - temp._42 = m1->_41 * m2->_12 + m1->_42 * m2->_22 + m1->_43 * m2->_32 + m1->_44 * m2->_42; - temp._43 = m1->_41 * m2->_13 + m1->_42 * m2->_23 + m1->_43 * m2->_33 + m1->_44 * m2->_43; - temp._44 = m1->_41 * m2->_14 + m1->_42 * m2->_24 + m1->_43 * m2->_34 + m1->_44 * m2->_44; - - *result = temp; -} - HRESULT hr_ddraw_from_wined3d(HRESULT hr) {