June 2019 - Wine-Devel - list.winehq.org

[PATCH 01/10] dxgi: Add tests for setting the fullscreen state of swapchains with destroyed windows.
by Henri Verbeet June 20, 2019

June 20, 2019

From: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166680. dlls/dxgi/tests/dxgi.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index bff894773a5..f5e1b10a746 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2284,6 +2284,40 @@ static void test_set_fullscreen(void) DestroyWindow(swapchain_desc.OutputWindow); swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + DestroyWindow(swapchain_desc.OutputWindow); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + DestroyWindow(swapchain_desc.OutputWindow); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); -- 2.11.0

3 2

[PATCH 10/10] d3drm: Implement d3drm_frame3_Transform().
by Henri Verbeet June 19, 2019

June 19, 2019

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166701. dlls/d3drm/frame.c | 35 +++++++++++++++++---- dlls/d3drm/tests/d3drm.c | 81 +++++++++++++++++++++++++++++++++--------------- 2 files changed, 85 insertions(+), 31 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index e31d8142a31..13c9af19a42 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -155,6 +155,17 @@ static void d3drm_matrix_set_rotation(struct d3drm_matrix *matrix, D3DVECTOR *ax matrix->_44 = 1.0f; } +static void d3drm_vector_transform_affine(D3DVECTOR *dst, const D3DVECTOR *v, const struct d3drm_matrix *m) +{ + D3DVECTOR tmp; + + tmp.u1.x = v->u1.x * m->_11 + v->u2.y * m->_21 + v->u3.z * m->_31 + m->_41; + tmp.u2.y = v->u1.x * m->_12 + v->u2.y * m->_22 + v->u3.z * m->_32 + m->_42; + tmp.u3.z = v->u1.x * m->_13 + v->u2.y * m->_23 + v->u3.z * m->_33 + m->_43; + + *dst = tmp; +} + static HRESULT WINAPI d3drm_frame_array_QueryInterface(IDirect3DRMFrameArray *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); @@ -2589,23 +2600,35 @@ static HRESULT WINAPI d3drm_frame1_SetZbufferMode(IDirect3DRMFrame *iface, D3DRM static HRESULT WINAPI d3drm_frame3_Transform(IDirect3DRMFrame3 *iface, D3DVECTOR *d, D3DVECTOR *s) { - FIXME("iface %p, d %p, s %p stub!\n", iface, d, s); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, d %p, s %p.\n", iface, d, s); + + d3drm_vector_transform_affine(d, s, &frame->transform); + while ((frame = frame->parent)) + { + d3drm_vector_transform_affine(d, d, &frame->transform); + } + + return D3DRM_OK; } static HRESULT WINAPI d3drm_frame2_Transform(IDirect3DRMFrame2 *iface, D3DVECTOR *d, D3DVECTOR *s) { - FIXME("iface %p, d %p, s %p stub!\n", iface, d, s); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - return E_NOTIMPL; + TRACE("iface %p, d %p, s %p.\n", iface, d, s); + + return d3drm_frame3_Transform(&frame->IDirect3DRMFrame3_iface, d, s); } static HRESULT WINAPI d3drm_frame1_Transform(IDirect3DRMFrame *iface, D3DVECTOR *d, D3DVECTOR *s) { - FIXME("iface %p, d %p, s %p stub!\n", iface, d, s); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, d %p, s %p.\n", iface, d, s); + + return d3drm_frame3_Transform(&frame->IDirect3DRMFrame3_iface, d, s); } static HRESULT WINAPI d3drm_frame2_AddMoveCallback2(IDirect3DRMFrame2 *iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8b2922afbea..6ac7c35fae4 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -86,21 +86,21 @@ static void expect_matrix_(unsigned int line, const D3DRMMATRIX4D m, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44); } -#define check_vector(a, b, c, d, e) check_vector_(__LINE__, a, b, c, d, e) -static void check_vector_(unsigned int line, const D3DVECTOR *v, float x, float y, float z, unsigned int ulps) +#define expect_vector(v, x, y, z, u) expect_vector_(__LINE__, v, x, y, z, u) +static void expect_vector_(unsigned int line, const D3DVECTOR *v, float x, float y, float z, unsigned int ulps) { - BOOL ret = compare_float(U1(v)->x, x, ulps) - && compare_float(U2(v)->y, y, ulps) - && compare_float(U3(v)->z, z, ulps); + BOOL equal = compare_float(U1(*v).x, x, ulps) + && compare_float(U2(*v).y, y, ulps) + && compare_float(U3(*v).z, z, ulps); - ok_(__FILE__, line)(ret, "Got unexpected vector {%.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e}.\n", - U1(v)->x, U2(v)->y, U3(v)->z, x, y, z); + ok_(__FILE__, line)(equal, "Got unexpected vector {%.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e}.\n", + U1(*v).x, U2(*v).y, U3(*v).z, x, y, z); } #define vector_eq(a, b) vector_eq_(__LINE__, a, b) static void vector_eq_(unsigned int line, const D3DVECTOR *left, const D3DVECTOR *right) { - check_vector_(line, left, U1(right)->x, U2(right)->y, U3(right)->z, 0); + expect_vector_(line, left, U1(*right).x, U2(*right).y, U3(*right).z, 0); } static D3DRMMATRIX4D identity = { @@ -125,6 +125,13 @@ static void frame_set_transform(IDirect3DRMFrame *frame, IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, matrix); } +static void set_vector(D3DVECTOR *v, float x, float y, float z) +{ + U1(*v).x = x; + U2(*v).y = y; + U3(*v).z = z; +} + static void matrix_sanitise(D3DRMMATRIX4D m) { unsigned int i, j; @@ -515,10 +522,10 @@ static void test_MeshBuilder(void) /* Check that Load method generated default normals */ hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, NULL, &val2, n, NULL, NULL); ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); - check_vector(&n[0], 0.577350f, 0.577350f, 0.577350f, 32); - check_vector(&n[1], -0.229416f, 0.688247f, 0.688247f, 32); - check_vector(&n[2], -0.229416f, 0.688247f, 0.688247f, 32); - check_vector(&n[3], -0.577350f, 0.577350f, 0.577350f, 32); + expect_vector(&n[0], 0.577350f, 0.577350f, 0.577350f, 32); + expect_vector(&n[1], -0.229416f, 0.688247f, 0.688247f, 32); + expect_vector(&n[2], -0.229416f, 0.688247f, 0.688247f, 32); + expect_vector(&n[3], -0.577350f, 0.577350f, 0.577350f, 32); /* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */ valu = 1.23f; @@ -614,12 +621,12 @@ static void test_MeshBuilder(void) ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1); ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2); ok(val3 == 8, "Wrong number of face data bytes %d (must be 8)\n", val3); - check_vector(&v[0], 0.1f, 0.2f, 0.3f, 32); - check_vector(&v[1], 0.4f, 0.5f, 0.6f, 32); - check_vector(&v[2], 0.7f, 0.8f, 0.9f, 32); - check_vector(&n[0], 1.1f, 1.2f, 1.3f, 32); - check_vector(&n[1], 1.4f, 1.5f, 1.6f, 32); - check_vector(&n[2], 1.7f, 1.8f, 1.9f, 32); + expect_vector(&v[0], 0.1f, 0.2f, 0.3f, 32); + expect_vector(&v[1], 0.4f, 0.5f, 0.6f, 32); + expect_vector(&v[2], 0.7f, 0.8f, 0.9f, 32); + expect_vector(&n[0], 1.1f, 1.2f, 1.3f, 32); + expect_vector(&n[1], 1.4f, 1.5f, 1.6f, 32); + expect_vector(&n[2], 1.7f, 1.8f, 1.9f, 32); ok(f[0] == 3 , "Wrong component f[0] = %d (expected 3)\n", f[0]); ok(f[1] == 0 , "Wrong component f[1] = %d (expected 0)\n", f[1]); ok(f[2] == 0 , "Wrong component f[2] = %d (expected 0)\n", f[2]); @@ -683,13 +690,13 @@ static void test_MeshBuilder(void) ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2); ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1); - check_vector(&v[0], 0.1f * 2, 0.2f * 3, 0.3f * 4, 32); - check_vector(&v[1], 0.4f * 2, 0.5f * 3, 0.6f * 4, 32); - check_vector(&v[2], 0.7f * 2, 0.8f * 3, 0.9f * 4, 32); + expect_vector(&v[0], 0.1f * 2, 0.2f * 3, 0.3f * 4, 32); + expect_vector(&v[1], 0.4f * 2, 0.5f * 3, 0.6f * 4, 32); + expect_vector(&v[2], 0.7f * 2, 0.8f * 3, 0.9f * 4, 32); /* Normals are not affected by Scale */ - check_vector(&n[0], 1.1f, 1.2f, 1.3f, 32); - check_vector(&n[1], 1.4f, 1.5f, 1.6f, 32); - check_vector(&n[2], 1.7f, 1.8f, 1.9f, 32); + expect_vector(&n[0], 1.1f, 1.2f, 1.3f, 32); + expect_vector(&n[1], 1.4f, 1.5f, 1.6f, 32); + expect_vector(&n[2], 1.7f, 1.8f, 1.9f, 32); IDirect3DRMMeshBuilder_Release(pMeshBuilder); @@ -2768,9 +2775,10 @@ cleanup: static void test_frame_transform(void) { + IDirect3DRMFrame *frame, *subframe; D3DRMMATRIX4D matrix, add_matrix; - IDirect3DRMFrame *frame; IDirect3DRM *d3drm; + D3DVECTOR v1, v2; HRESULT hr; hr = Direct3DRMCreate(&d3drm); @@ -3000,6 +3008,29 @@ static void test_frame_transform(void) 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1); + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 4.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 8.0f, 0.0f, + 64.0f, 64.0f, 64.0f, 1.0f); + hr = IDirect3DRM_CreateFrame(d3drm, frame, &subframe); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + frame_set_transform(subframe, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 11.0f, 11.0f, 11.0f, 1.0f); + set_vector(&v1, 3.0f, 5.0f, 7.0f); + + hr = IDirect3DRMFrame_Transform(frame, &v2, &v1); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_vector(&v2, 70.0f, 84.0f, 120.0f, 1); + + hr = IDirect3DRMFrame_Transform(subframe, &v2, &v1); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_vector(&v2, 92.0f, 128.0f, 208.0f, 1); + + IDirect3DRMFrame_Release(subframe); IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); } -- 2.11.0

1 0

[PATCH 09/10] d3drm: Implement d3drm_frame3_AddRotation().
by Henri Verbeet June 19, 2019

June 19, 2019

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166702. dlls/d3drm/frame.c | 76 +++++++++++++++++++++++++++++++++++++++---- dlls/d3drm/tests/d3drm.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 49a5077ed73..e31d8142a31 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -125,6 +125,36 @@ static void d3drm_matrix_multiply_affine(struct d3drm_matrix *dst, *dst = tmp; } +static void d3drm_matrix_set_rotation(struct d3drm_matrix *matrix, D3DVECTOR *axis, float theta) +{ + float sin_theta, cos_theta, vers_theta; + + D3DRMVectorNormalize(axis); + sin_theta = sinf(theta); + cos_theta = cosf(theta); + vers_theta = 1.0f - cos_theta; + + matrix->_11 = vers_theta * axis->u1.x * axis->u1.x + cos_theta; + matrix->_21 = vers_theta * axis->u1.x * axis->u2.y - sin_theta * axis->u3.z; + matrix->_31 = vers_theta * axis->u1.x * axis->u3.z + sin_theta * axis->u2.y; + matrix->_41 = 0.0f; + + matrix->_12 = vers_theta * axis->u2.y * axis->u1.x + sin_theta * axis->u3.z; + matrix->_22 = vers_theta * axis->u2.y * axis->u2.y + cos_theta; + matrix->_32 = vers_theta * axis->u2.y * axis->u3.z - sin_theta * axis->u1.x; + matrix->_42 = 0.0f; + + matrix->_13 = vers_theta * axis->u3.z * axis->u1.x - sin_theta * axis->u2.y; + matrix->_23 = vers_theta * axis->u3.z * axis->u2.y + sin_theta * axis->u1.x; + matrix->_33 = vers_theta * axis->u3.z * axis->u3.z + cos_theta; + matrix->_43 = 0.0f; + + matrix->_14 = 0.0f; + matrix->_24 = 0.0f; + matrix->_34 = 0.0f; + matrix->_44 = 1.0f; +} + static HRESULT WINAPI d3drm_frame_array_QueryInterface(IDirect3DRMFrameArray *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); @@ -1149,26 +1179,58 @@ static HRESULT WINAPI d3drm_frame1_AddScale(IDirect3DRMFrame *iface, static HRESULT WINAPI d3drm_frame3_AddRotation(IDirect3DRMFrame3 *iface, D3DRMCOMBINETYPE type, D3DVALUE x, D3DVALUE y, D3DVALUE z, D3DVALUE theta) { - FIXME("iface %p, type %#x, x %.8e, y %.8e, z %.8e, theta %.8e stub!\n", - iface, type, x, y, z, theta); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); + struct d3drm_matrix m; + D3DVECTOR axis; - return E_NOTIMPL; + TRACE("iface %p, type %#x, x %.8e, y %.8e, z %.8e, theta %.8e.\n", iface, type, x, y, z, theta); + + axis.u1.x = x; + axis.u2.y = y; + axis.u3.z = z; + + switch (type) + { + case D3DRMCOMBINE_REPLACE: + d3drm_matrix_set_rotation(&frame->transform, &axis, theta); + break; + + case D3DRMCOMBINE_BEFORE: + d3drm_matrix_set_rotation(&m, &axis, theta); + d3drm_matrix_multiply_affine(&frame->transform, &m, &frame->transform); + break; + + case D3DRMCOMBINE_AFTER: + d3drm_matrix_set_rotation(&m, &axis, theta); + d3drm_matrix_multiply_affine(&frame->transform, &frame->transform, &m); + break; + + default: + FIXME("Unhandled type %#x.\n", type); + return D3DRMERR_BADVALUE; + } + + return D3DRM_OK; } static HRESULT WINAPI d3drm_frame2_AddRotation(IDirect3DRMFrame2 *iface, D3DRMCOMBINETYPE type, D3DVALUE x, D3DVALUE y, D3DVALUE z, D3DVALUE theta) { - FIXME("iface %p, type %#x, x %.8e, y %.8e, z %.8e, theta %.8e stub!\n", iface, type, x, y, z, theta); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, x %.8e, y %.8e, z %.8e, theta %.8e.\n", iface, type, x, y, z, theta); + + return d3drm_frame3_AddRotation(&frame->IDirect3DRMFrame3_iface, type, x, y, z, theta); } static HRESULT WINAPI d3drm_frame1_AddRotation(IDirect3DRMFrame *iface, D3DRMCOMBINETYPE type, D3DVALUE x, D3DVALUE y, D3DVALUE z, D3DVALUE theta) { - FIXME("iface %p, type %#x, x %.8e, y %.8e, z %.8e, theta %.8e stub!\n", iface, type, x, y, z, theta); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, x %.8e, y %.8e, z %.8e, theta %.8e.\n", iface, type, x, y, z, theta); + + return d3drm_frame3_AddRotation(&frame->IDirect3DRMFrame3_iface, type, x, y, z, theta); } static HRESULT WINAPI d3drm_frame3_AddVisual(IDirect3DRMFrame3 *iface, IUnknown *visual) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 776282ce286..8b2922afbea 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -22,10 +22,12 @@ #include <limits.h> #define COBJMACROS +#define _USE_MATH_DEFINES #include <d3d.h> #include <initguid.h> #include <d3drm.h> #include <d3drmwin.h> +#include <math.h> #include "wine/test.h" @@ -123,6 +125,20 @@ static void frame_set_transform(IDirect3DRMFrame *frame, IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, matrix); } +static void matrix_sanitise(D3DRMMATRIX4D m) +{ + unsigned int i, j; + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + if (m[i][j] > -1e-7f && m[i][j] < 1e-7f) + m[i][j] = 0.0f; + } + } +} + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -2915,6 +2931,75 @@ static void test_frame_transform(void) 0.0f, 0.0f, 2.0f, 0.0f, 6.0f, 6.0f, 6.0f, 1.0f, 1); + frame_set_transform(frame, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f); + hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 1.0f, 0.0f, 0.0f, M_PI_2); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + matrix_sanitise(matrix); + expect_matrix(matrix, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, -1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, 1); + + frame_set_transform(frame, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f); + hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_BEFORE, 1.0f, 0.0f, 0.0f, M_PI_2); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + matrix_sanitise(matrix); + expect_matrix(matrix, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, -1.0f, 0.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); + + frame_set_transform(frame, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f); + hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_AFTER, 1.0f, 0.0f, 0.0f, M_PI_2); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + matrix_sanitise(matrix); + expect_matrix(matrix, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, -1.0f, 0.0f, 0.0f, + 3.0f, -3.0f, 3.0f, 1.0f, 1); + + hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 0.0f, 0.0f, 1.0f, M_PI_2); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + matrix_sanitise(matrix); + expect_matrix(matrix, + 0.0f, 1.0f, 0.0f, 0.0f, + -1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, 1); + + hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 0.0f, 0.0f, 0.0f, M_PI_2); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + matrix_sanitise(matrix); + expect_matrix(matrix, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, -1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, 1); + IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); } -- 2.11.0

1 0

[PATCH 08/10] d3drm: Implement d3drm_frame3_AddScale().
by Henri Verbeet June 19, 2019

June 19, 2019

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166700. dlls/d3drm/frame.c | 59 +++++++++++++++++++++++++++++++++++++++++++----- dlls/d3drm/tests/d3drm.c | 45 ++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 7891bd67ee5..49a5077ed73 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -1078,25 +1078,72 @@ static HRESULT WINAPI d3drm_frame1_AddTranslation(IDirect3DRMFrame *iface, static HRESULT WINAPI d3drm_frame3_AddScale(IDirect3DRMFrame3 *iface, D3DRMCOMBINETYPE type, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) { - FIXME("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e stub!\n", iface, type, sx, sy, sz); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e.\n", iface, type, sx, sy, sz); + + switch (type) + { + case D3DRMCOMBINE_REPLACE: + frame->transform = identity; + frame->transform._11 = sx; + frame->transform._22 = sy; + frame->transform._33 = sz; + break; + + case D3DRMCOMBINE_BEFORE: + frame->transform._11 *= sx; + frame->transform._12 *= sx; + frame->transform._13 *= sx; + frame->transform._21 *= sy; + frame->transform._22 *= sy; + frame->transform._23 *= sy; + frame->transform._31 *= sz; + frame->transform._32 *= sz; + frame->transform._33 *= sz; + break; + + case D3DRMCOMBINE_AFTER: + frame->transform._11 *= sx; + frame->transform._12 *= sy; + frame->transform._13 *= sz; + frame->transform._21 *= sx; + frame->transform._22 *= sy; + frame->transform._23 *= sz; + frame->transform._31 *= sx; + frame->transform._32 *= sy; + frame->transform._33 *= sz; + frame->transform._41 *= sx; + frame->transform._42 *= sy; + frame->transform._43 *= sz; + break; + + default: + FIXME("Unhandled type %#x.\n", type); + return D3DRMERR_BADVALUE; + } + + return D3DRM_OK; } static HRESULT WINAPI d3drm_frame2_AddScale(IDirect3DRMFrame2 *iface, D3DRMCOMBINETYPE type, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) { - FIXME("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e stub!\n", iface, type, sx, sy, sz); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e.\n", iface, type, sx, sy, sz); + + return d3drm_frame3_AddScale(&frame->IDirect3DRMFrame3_iface, type, sx, sy, sz); } static HRESULT WINAPI d3drm_frame1_AddScale(IDirect3DRMFrame *iface, D3DRMCOMBINETYPE type, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) { - FIXME("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e stub!\n", iface, type, sx, sy, sz); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e.\n", iface, type, sx, sy, sz); + + return d3drm_frame3_AddScale(&frame->IDirect3DRMFrame3_iface, type, sx, sy, sz); } static HRESULT WINAPI d3drm_frame3_AddRotation(IDirect3DRMFrame3 *iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f7a81fc519b..776282ce286 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2870,6 +2870,51 @@ static void test_frame_transform(void) 0.0f, 0.0f, 2.0f, 0.0f, 3.0f, 3.0f, 3.0f, 1.0f, 1); + frame_set_transform(frame, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f); + hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_REPLACE, 2.0f, 2.0f, 2.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, 1); + + frame_set_transform(frame, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f); + hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_BEFORE, 2.0f, 2.0f, 2.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); + + frame_set_transform(frame, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f); + hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_AFTER, 2.0f, 2.0f, 2.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 6.0f, 6.0f, 6.0f, 1.0f, 1); + IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); } -- 2.11.0

1 0

[PATCH 07/10] d3drm: Implement d3drm_frame3_AddTranslation().
by Henri Verbeet June 19, 2019

June 19, 2019

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166699. dlls/d3drm/frame.c | 44 ++++++++++++++++++++++++++++++++++++++------ dlls/d3drm/tests/d3drm.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 9b38a296449..7891bd67ee5 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -1022,25 +1022,57 @@ static HRESULT WINAPI d3drm_frame1_AddTransform(IDirect3DRMFrame *iface, static HRESULT WINAPI d3drm_frame3_AddTranslation(IDirect3DRMFrame3 *iface, D3DRMCOMBINETYPE type, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, type %#x, x %.8e, y %.8e, z %.8e stub!\n", iface, type, x, y, z); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, x %.8e, y %.8e, z %.8e.\n", iface, type, x, y, z); + + switch (type) + { + case D3DRMCOMBINE_REPLACE: + frame->transform = identity; + frame->transform._41 = x; + frame->transform._42 = y; + frame->transform._43 = z; + break; + + case D3DRMCOMBINE_BEFORE: + frame->transform._41 += x * frame->transform._11 + y * frame->transform._21 + z * frame->transform._31; + frame->transform._42 += x * frame->transform._12 + y * frame->transform._22 + z * frame->transform._32; + frame->transform._43 += x * frame->transform._13 + y * frame->transform._23 + z * frame->transform._33; + break; + + case D3DRMCOMBINE_AFTER: + frame->transform._41 += x; + frame->transform._42 += y; + frame->transform._43 += z; + break; + + default: + FIXME("Unhandled type %#x.\n", type); + return D3DRMERR_BADVALUE; + } + + return D3DRM_OK; } static HRESULT WINAPI d3drm_frame2_AddTranslation(IDirect3DRMFrame2 *iface, D3DRMCOMBINETYPE type, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, type %#x, x %.8e, y %.8e, z %.8e stub!\n", iface, type, x, y, z); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, x %.8e, y %.8e, z %.8e.\n", iface, type, x, y, z); + + return d3drm_frame3_AddTranslation(&frame->IDirect3DRMFrame3_iface, type, x, y, z); } static HRESULT WINAPI d3drm_frame1_AddTranslation(IDirect3DRMFrame *iface, D3DRMCOMBINETYPE type, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, type %#x, x %.8e, y %.8e, z %.8e stub!\n", iface, type, x, y, z); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, x %.8e, y %.8e, z %.8e.\n", iface, type, x, y, z); + + return d3drm_frame3_AddTranslation(&frame->IDirect3DRMFrame3_iface, type, x, y, z); } static HRESULT WINAPI d3drm_frame3_AddScale(IDirect3DRMFrame3 *iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index bbec35bc0a2..f7a81fc519b 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2825,6 +2825,51 @@ static void test_frame_transform(void) hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix); ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_REPLACE, 3.0f, 3.0f, 3.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); + + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_BEFORE, 3.0f, 3.0f, 3.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 6.0f, 6.0f, 6.0f, 1.0f, 1); + + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_AFTER, 3.0f, 3.0f, 3.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); + IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); } -- 2.11.0

1 0

[PATCH 06/10] d3drm: Validate that the transformation is affine in d3drm_frame3_AddTransform().
by Henri Verbeet June 19, 2019

June 19, 2019

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166698. dlls/d3drm/frame.c | 3 +++ dlls/d3drm/tests/d3drm.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index b4c7e995228..9b38a296449 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -974,6 +974,9 @@ static HRESULT WINAPI d3drm_frame3_AddTransform(IDirect3DRMFrame3 *iface, TRACE("iface %p, type %#x, matrix %p.\n", iface, type, matrix); + if (m->_14 != 0.0f || m->_24 != 0.0f || m->_34 != 0.0f || m->_44 != 1.0f) + return D3DRMERR_BADVALUE; + switch (type) { case D3DRMCOMBINE_REPLACE: diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 9494603b990..bbec35bc0a2 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2821,6 +2821,10 @@ static void test_frame_transform(void) 0.0f, 0.0f, 2.0f, 0.0f, 3.0f, 3.0f, 3.0f, 1.0f, 1); + add_matrix[3][3] = 2.0f; + hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); } -- 2.11.0

1 0

[PATCH 05/10] d3drm: Implement the BEFORE and AFTER frame transform combine types.
by Henri Verbeet June 19, 2019

June 19, 2019

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166697. dlls/d3drm/frame.c | 34 +++++++++++++-- dlls/d3drm/tests/d3drm.c | 109 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 133 insertions(+), 10 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 2d32fb51e38..b4c7e995228 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -97,6 +97,34 @@ static inline struct d3drm_animation *impl_from_IDirect3DRMAnimation2(IDirect3DR return CONTAINING_RECORD(iface, struct d3drm_animation, IDirect3DRMAnimation2_iface); } +static void d3drm_matrix_multiply_affine(struct d3drm_matrix *dst, + const struct d3drm_matrix *src1, const struct d3drm_matrix *src2) +{ + struct d3drm_matrix tmp; + + tmp._11 = src1->_11 * src2->_11 + src1->_12 * src2->_21 + src1->_13 * src2->_31; + tmp._12 = src1->_11 * src2->_12 + src1->_12 * src2->_22 + src1->_13 * src2->_32; + tmp._13 = src1->_11 * src2->_13 + src1->_12 * src2->_23 + src1->_13 * src2->_33; + tmp._14 = 0.0f; + + tmp._21 = src1->_21 * src2->_11 + src1->_22 * src2->_21 + src1->_23 * src2->_31; + tmp._22 = src1->_21 * src2->_12 + src1->_22 * src2->_22 + src1->_23 * src2->_32; + tmp._23 = src1->_21 * src2->_13 + src1->_22 * src2->_23 + src1->_23 * src2->_33; + tmp._24 = 0.0f; + + tmp._31 = src1->_31 * src2->_11 + src1->_32 * src2->_21 + src1->_33 * src2->_31; + tmp._32 = src1->_31 * src2->_12 + src1->_32 * src2->_22 + src1->_33 * src2->_32; + tmp._33 = src1->_31 * src2->_13 + src1->_32 * src2->_23 + src1->_33 * src2->_33; + tmp._34 = 0.0f; + + tmp._41 = src1->_41 * src2->_11 + src1->_42 * src2->_21 + src1->_43 * src2->_31 + src2->_41; + tmp._42 = src1->_41 * src2->_12 + src1->_42 * src2->_22 + src1->_43 * src2->_32 + src2->_42; + tmp._43 = src1->_41 * src2->_13 + src1->_42 * src2->_23 + src1->_43 * src2->_33 + src2->_43; + tmp._44 = 1.0f; + + *dst = tmp; +} + static HRESULT WINAPI d3drm_frame_array_QueryInterface(IDirect3DRMFrameArray *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); @@ -953,15 +981,15 @@ static HRESULT WINAPI d3drm_frame3_AddTransform(IDirect3DRMFrame3 *iface, break; case D3DRMCOMBINE_BEFORE: - FIXME("D3DRMCOMBINE_BEFORE not supported yet\n"); + d3drm_matrix_multiply_affine(&frame->transform, m, &frame->transform); break; case D3DRMCOMBINE_AFTER: - FIXME("D3DRMCOMBINE_AFTER not supported yet\n"); + d3drm_matrix_multiply_affine(&frame->transform, &frame->transform, m); break; default: - WARN("Unknown Combine Type %u\n", type); + FIXME("Unhandled type %#x.\n", type); return D3DRMERR_BADVALUE; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index cc4f8fe16a3..9494603b990 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -58,6 +58,32 @@ static BOOL compare_float(float f, float g, unsigned int ulps) return TRUE; } +#define expect_matrix(m, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44, u) \ + expect_matrix_(__LINE__, m, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44, u) +static void expect_matrix_(unsigned int line, const D3DRMMATRIX4D m, + float m11, float m12, float m13, float m14, float m21, float m22, float m23, float m24, + float m31, float m32, float m33, float m34, float m41, float m42, float m43, float m44, + unsigned int ulps) +{ + BOOL equal = compare_float(m[0][0], m11, ulps) && compare_float(m[0][1], m12, ulps) + && compare_float(m[0][2], m13, ulps) && compare_float(m[0][3], m14, ulps) + && compare_float(m[1][0], m21, ulps) && compare_float(m[1][1], m22, ulps) + && compare_float(m[1][2], m23, ulps) && compare_float(m[1][3], m24, ulps) + && compare_float(m[2][0], m31, ulps) && compare_float(m[2][1], m32, ulps) + && compare_float(m[2][2], m33, ulps) && compare_float(m[2][3], m34, ulps) + && compare_float(m[3][0], m41, ulps) && compare_float(m[3][1], m42, ulps) + && compare_float(m[3][2], m43, ulps) && compare_float(m[3][3], m44, ulps); + + ok_(__FILE__, line)(equal, + "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, " + "%.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e}, " + "expected {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, " + "%.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + m[0][0], m[0][1], m[0][2], m[0][3], m[1][0], m[1][1], m[1][2], m[1][3], + m[2][0], m[2][1], m[2][2], m[2][3], m[3][0], m[3][1], m[3][2], m[3][3], + m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44); +} + #define check_vector(a, b, c, d, e) check_vector_(__LINE__, a, b, c, d, e) static void check_vector_(unsigned int line, const D3DVECTOR *v, float x, float y, float z, unsigned int ulps) { @@ -82,6 +108,21 @@ static D3DRMMATRIX4D identity = { { 0.0f, 0.0f, 0.0f, 1.0f } }; +static void frame_set_transform(IDirect3DRMFrame *frame, + float m11, float m12, float m13, float m14, float m21, float m22, float m23, float m24, + float m31, float m32, float m33, float m34, float m41, float m42, float m43, float m44) +{ + D3DRMMATRIX4D matrix = + { + {m11, m12, m13, m14}, + {m21, m22, m23, m24}, + {m31, m32, m33, m34}, + {m41, m42, m43, m44}, + }; + + IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, matrix); +} + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -2711,20 +2752,74 @@ cleanup: static void test_frame_transform(void) { - HRESULT hr; - IDirect3DRM *d3drm; + D3DRMMATRIX4D matrix, add_matrix; IDirect3DRMFrame *frame; - D3DRMMATRIX4D matrix; + IDirect3DRM *d3drm; + HRESULT hr; hr = Direct3DRMCreate(&d3drm); - ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRM_CreateFrame(d3drm, NULL, &frame); - ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMFrame_GetTransform(frame, matrix); - ok(hr == D3DRM_OK, "IDirect3DRMFrame_GetTransform returned hr = %x\n", hr); - ok(!memcmp(matrix, identity, sizeof(D3DRMMATRIX4D)), "Returned matrix is not identity\n"); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, 0); + + memcpy(add_matrix, identity, sizeof(add_matrix)); + add_matrix[3][0] = 3.0f; + add_matrix[3][1] = 3.0f; + add_matrix[3][2] = 3.0f; + + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); + + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_BEFORE, add_matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 6.0f, 6.0f, 6.0f, 1.0f, 1); + + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_AFTER, add_matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); -- 2.11.0

1 0

[PATCH 02/10] dxgi: Return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE if setting the fullscreen state failed.
by Henri Verbeet June 19, 2019

June 19, 2019

From: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166680. dlls/dxgi/swapchain.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 030bb67c22d..4f01d9ce024 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -385,18 +385,18 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen swapchain_desc.windowed = !fullscreen; hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, &swapchain_desc, NULL); wined3d_mutex_unlock(); - - if (SUCCEEDED(hr)) + if (FAILED(hr)) { - if (swapchain->target) - IDXGIOutput_Release(swapchain->target); - swapchain->target = target; - return S_OK; + if (target) + IDXGIOutput_Release(target); + return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; } - if (target) - IDXGIOutput_Release(target); - return hr; + if (swapchain->target) + IDXGIOutput_Release(swapchain->target); + swapchain->target = target; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenState(IDXGISwapChain1 *iface, -- 2.11.0

1 0

[PATCH 5/5] wined3d: Use wined3d_texture_gl_load_texture() in texture3d_load_location().
by Henri Verbeet June 19, 2019

June 19, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 74 ++------------------------------------------------ 1 file changed, 2 insertions(+), 72 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 52dbe516abd..4b6478537df 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3352,45 +3352,12 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc } /* Context activation is done by the caller. */ -static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, BOOL dest_is_srgb) -{ - struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - unsigned int row_pitch, slice_pitch; - struct wined3d_bo_address data; - struct wined3d_box src_box; - - /* Optimisations are possible, but the effort should be put into either - * implementing EXT_SRGB_DECODE in the driver or finding out why we - * picked the wrong copy for the original upload and fixing that. - * - * Also keep in mind that we want to avoid using resource.heap_memory - * for DEFAULT pool surfaces. */ - WARN_(d3d_perf)("Performing slow rgb/srgb volume transfer.\n"); - data.buffer_object = 0; - if (!(data.addr = heap_alloc(sub_resource->size))) - return; - - wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, !dest_is_srgb); - wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, dest_is_srgb); - wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, - &src_box, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0, FALSE); - - heap_free(data.addr); -} - -/* Context activation is done by the caller. */ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - unsigned int row_pitch, slice_pitch; if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) return FALSE; @@ -3399,43 +3366,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in { case WINED3D_LOCATION_TEXTURE_RGB: case WINED3D_LOCATION_TEXTURE_SRGB: - if (sub_resource->locations & WINED3D_LOCATION_SYSMEM) - { - struct wined3d_const_bo_address data = {0, texture->resource.heap_memory}; - struct wined3d_box src_box; - - data.addr += sub_resource->offset; - wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); - wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, - &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); - } - else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) - { - struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; - struct wined3d_box src_box; - - wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); - wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, - &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); - } - else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - { - texture3d_srgb_transfer(texture, sub_resource_idx, context, TRUE); - } - else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_SRGB) - { - texture3d_srgb_transfer(texture, sub_resource_idx, context, FALSE); - } - else - { - FIXME("Implement texture loading from %s.\n", wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - break; + return wined3d_texture_gl_load_texture(texture_gl, sub_resource_idx, + context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_BUFFER: @@ -3446,8 +3378,6 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_debug_location(sub_resource->locations)); return FALSE; } - - return TRUE; } static const struct wined3d_texture_ops texture3d_ops = -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to destroy_dummy_textures().
by Henri Verbeet June 19, 2019

June 19, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 81b5a3ab620..768375d837a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -812,10 +812,11 @@ static void wined3d_device_gl_create_dummy_textures(struct wined3d_device_gl *de } /* Context activation is done by the caller. */ -static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) +static void wined3d_device_gl_destroy_dummy_textures(struct wined3d_device_gl *device_gl, + struct wined3d_context_gl *context_gl) { - struct wined3d_dummy_textures *dummy_textures = &wined3d_device_gl(device)->dummy_textures; - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_dummy_textures *dummy_textures = &device_gl->dummy_textures; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) { @@ -1054,9 +1055,13 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) { struct wined3d_resource *resource, *cursor; struct wined3d_device *device = object; + struct wined3d_context_gl *context_gl; + struct wined3d_device_gl *device_gl; struct wined3d_context *context; struct wined3d_shader *shader; + device_gl = wined3d_device_gl(device); + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) { TRACE("Unloading resource %p.\n", resource); @@ -1069,9 +1074,10 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) } context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); device->blitter->ops->blitter_destroy(device->blitter, context); device->shader_backend->shader_free_private(device, context); - destroy_dummy_textures(device, context); + wined3d_device_gl_destroy_dummy_textures(device_gl, context_gl); destroy_default_samplers(device, context); context_release(context); -- 2.11.0

1 0