Henri Verbeet : d3d9: Introduce a helper to convert d3d9 transform states to wined3d states.
Alexandre Julliard
julliard at winehq.org
Thu Apr 2 14:27:37 CDT 2020
Module: wine
Branch: master
Commit: 4393d284fd8a5995b6811f743f4a4433032353ed
URL: https://source.winehq.org/git/wine.git/?a=commit;h=4393d284fd8a5995b6811f743f4a4433032353ed
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Apr 2 15:22:58 2020 +0430
d3d9: Introduce a helper to convert d3d9 transform states to wined3d states.
Signed-off-by: Chip Davis <cdavis at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d9/device.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 434ec8fb8f..17d643a53c 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -556,6 +556,11 @@ static enum wined3d_texture_filter_type wined3d_texture_filter_type_from_d3d(D3D
return (enum wined3d_texture_filter_type)type;
}
+static enum wined3d_transform_state wined3d_transform_state_from_d3d(D3DTRANSFORMSTATETYPE type)
+{
+ return (enum wined3d_transform_state)type;
+}
+
static void device_reset_viewport_state(struct d3d9_device *device)
{
struct wined3d_viewport vp;
@@ -2164,7 +2169,8 @@ static HRESULT WINAPI d3d9_device_SetTransform(IDirect3DDevice9Ex *iface,
/* Note: D3DMATRIX is compatible with struct wined3d_matrix. */
wined3d_mutex_lock();
- wined3d_stateblock_set_transform(device->update_state, state, (const struct wined3d_matrix *)matrix);
+ wined3d_stateblock_set_transform(device->update_state,
+ wined3d_transform_state_from_d3d(state), (const struct wined3d_matrix *)matrix);
wined3d_mutex_unlock();
return D3D_OK;
@@ -2194,7 +2200,8 @@ static HRESULT WINAPI d3d9_device_MultiplyTransform(IDirect3DDevice9Ex *iface,
/* Note: D3DMATRIX is compatible with struct wined3d_matrix. */
wined3d_mutex_lock();
- wined3d_stateblock_multiply_transform(device->state, state, (const struct wined3d_matrix *)matrix);
+ wined3d_stateblock_multiply_transform(device->state,
+ wined3d_transform_state_from_d3d(state), (const struct wined3d_matrix *)matrix);
wined3d_mutex_unlock();
return D3D_OK;
More information about the wine-cvs
mailing list