ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Remove stateblock handling from wined3d_device_multiply_transform(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-01-22 19:50:24 -06:00 committed by Alexandre Julliard
parent 110929a662
commit 7163fbba85
4 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/d3d8/tests/device.c
View File

@ -9295,7 +9295,6 @@ static void test_multiply_transform(void)
hr = IDirect3DDevice8_GetTransform(device, tests[i], &ret_mat);
ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
todo_wine
ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", i);
hr = IDirect3DDevice8_CaptureStateBlock(device, stateblock);

1
dlls/d3d9/tests/device.c
View File

@ -13129,7 +13129,6 @@ static void test_multiply_transform(void)
hr = IDirect3DDevice9_GetTransform(device, tests[i], &ret_mat);
ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
todo_wine
ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", i);
hr = IDirect3DStateBlock9_Capture(stateblock);

1
dlls/ddraw/tests/ddraw7.c
View File

@ -15397,7 +15397,6 @@ static void test_multiply_transform(void)
hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat);
ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
todo_wine
ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", i);
hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock);

17
dlls/wined3d/device.c
View File

@ -1529,26 +1529,21 @@ void CDECL wined3d_device_get_transform(const struct wined3d_device *device,
void CDECL wined3d_device_multiply_transform(struct wined3d_device *device,
enum wined3d_transform_state state, const struct wined3d_matrix *matrix)
{
const struct wined3d_matrix *mat;
struct wined3d_matrix temp;
struct wined3d_matrix *mat;
TRACE("device %p, state %s, matrix %p.\n", device, debug_d3dtstype(state), matrix);
/* Note: Using 'updateStateBlock' rather than 'stateblock' in the code
* below means it will be recorded in a state block change, but it
* works regardless where it is recorded.
* If this is found to be wrong, change to StateBlock. */
if (state > HIGHEST_TRANSFORMSTATE)
{
WARN("Unhandled transform state %#x.\n", state);
return;
}
mat = &device->update_state->transforms[state];
multiply_matrix(&temp, mat, matrix);
/* Apply change via set transform - will reapply to eg. lights this way. */
wined3d_device_set_transform(device, state, &temp);
/* Tests show that stateblock recording is ignored; the change goes directly
* into the primary stateblock. */
mat = &device->state.transforms[state];
multiply_matrix(mat, mat, matrix);
wined3d_cs_emit_set_transform(device->cs, state, matrix);
}
/* Note lights are real special cases. Although the device caps state only