[PATCH 1/5] d3d9: Make shader validator traces less verbose.

[Zebediah Figura]

Suggested by Paul Gofman.

Signed-off-by: Zebediah Figura 
---
 dlls/d3d9/d3d9_main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c
index 75e627dd76..137da370e0 100644
--- a/dlls/d3d9/d3d9_main.c
+++ b/dlls/d3d9/d3d9_main.c
@@ -151,7 +151,7 @@ static ULONG WINAPI shader_validator_Release(IDirect3DShaderValidator9 *iface)
 static HRESULT WINAPI shader_validator_Begin(IDirect3DShaderValidator9 *iface,
         shader_validator_cb callback, void *context, DWORD_PTR arg3)
 {
-    FIXME("iface %p, callback %p, context %p, arg3 %#Ix, stub!\n", iface, callback, context, arg3);
+    WARN("iface %p, callback %p, context %p, arg3 %#Ix, stub!\n", iface, callback, context, arg3);

return S_OK;
 }
@@ -163,7 +163,7 @@ static HRESULT WINAPI shader_validator_Begin(IDirect3DShaderValidator9 *iface,
 static HRESULT WINAPI shader_validator_Instruction(IDirect3DShaderValidator9 *iface,
         const char *file, int line, const DWORD *tokens, DWORD token_count)
 {
-    FIXME("iface %p, file %s, line %u, tokens %p, token_count %u, stub!\n",
+    WARN("iface %p, file %s, line %u, tokens %p, token_count %u, stub!\n",
             iface, debugstr_a(file), line, tokens, token_count);

return S_OK;
@@ -171,7 +171,7 @@ static HRESULT WINAPI shader_validator_Instruction(IDirect3DShaderValidator9 *if

static HRESULT WINAPI shader_validator_End(IDirect3DShaderValidator9 *iface)
 {
-    FIXME("iface %p, stub!\n", iface);
+    WARN("iface %p, stub!\n", iface);

return S_OK;
 }
@@ -190,7 +190,7 @@ static IDirect3DShaderValidator9 shader_validator = {&shader_validator_vtbl};

IDirect3DShaderValidator9 * WINAPI Direct3DShaderValidatorCreate9(void)
 {
-    TRACE("Returning validator %p.\n", &shader_validator);
+    FIXME("Returning stub validator %p.\n", &shader_validator);

return &shader_validator;
 }

[PATCH 2/5] d3d9: Retrieve transform states from the primary stateblock.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/d3d9/device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 5bf0d6484c..fafdec10d8 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -2123,7 +2123,7 @@ static HRESULT WINAPI d3d9_device_GetTransform(IDirect3DDevice9Ex *iface,

/* Note: D3DMATRIX is compatible with struct wined3d_matrix. */
     wined3d_mutex_lock();
-    wined3d_device_get_transform(device->wined3d_device, state, (struct wined3d_matrix *)matrix);
+    memcpy(matrix, &wined3d_stateblock_get_state(device->state)->transforms[state], sizeof(*matrix));
     wined3d_mutex_unlock();

return D3D_OK;

[PATCH 2/5] d3d9: Retrieve transform states from the primary stateblock.

[Henri Verbeet]

Signed-off-by: Henri Verbeet

[PATCH 3/5] d3d9: Stop setting the device state in d3d9_device_SetTransform() and d3d9_device_MultiplyTransform().

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/d3d9/device.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index fafdec10d8..8a79585f37 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -2107,8 +2107,6 @@ 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);
-    if (!device->recording)
-        wined3d_device_set_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix);
     wined3d_mutex_unlock();

return D3D_OK;
@@ -2139,7 +2137,6 @@ 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_device_multiply_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix);
     wined3d_mutex_unlock();

return D3D_OK;

[PATCH 3/5] d3d9: Stop setting the device state in d3d9_device_SetTransform() and d3d9_device_MultiplyTransform().

[Henri Verbeet]

Signed-off-by: Henri Verbeet

[PATCH 4/5] d3d9: Retrieve clip planes from the primary stateblock.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/d3d9/device.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 8a79585f37..a681e220c5 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -2297,17 +2297,16 @@ static HRESULT WINAPI d3d9_device_SetClipPlane(IDirect3DDevice9Ex *iface, DWORD
 static HRESULT WINAPI d3d9_device_GetClipPlane(IDirect3DDevice9Ex *iface, DWORD index, float *plane)
 {
     struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
-    HRESULT hr;

TRACE("iface %p, index %u, plane %p.\n", iface, index, plane);

index = min(index, device->max_user_clip_planes - 1);

wined3d_mutex_lock();
-    hr = wined3d_device_get_clip_plane(device->wined3d_device, index, (struct wined3d_vec4 *)plane);
+    memcpy(plane, &wined3d_stateblock_get_state(device->state)->clip_planes[index], sizeof(struct wined3d_vec4));
     wined3d_mutex_unlock();

-    return hr;
+    return D3D_OK;
 }

static void resolve_depth_buffer(struct d3d9_device *device)

[PATCH 4/5] d3d9: Retrieve clip planes from the primary stateblock.

[Henri Verbeet]

Signed-off-by: Henri Verbeet

[PATCH 5/5] d3d9: Stop setting the device state in d3d9_device_SetClipPlane().

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/d3d9/device.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index a681e220c5..447aa26844 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -2287,8 +2287,6 @@ static HRESULT WINAPI d3d9_device_SetClipPlane(IDirect3DDevice9Ex *iface, DWORD

wined3d_mutex_lock();
     hr = wined3d_stateblock_set_clip_plane(device->update_state, index, (const struct wined3d_vec4 *)plane);
-    if (SUCCEEDED(hr) && !device->recording)
-        hr = wined3d_device_set_clip_plane(device->wined3d_device, index, (const struct wined3d_vec4 *)plane);
     wined3d_mutex_unlock();

return hr;

[PATCH 5/5] d3d9: Stop setting the device state in d3d9_device_SetClipPlane().

[Henri Verbeet]

Signed-off-by: Henri Verbeet

[Henri Verbeet]

Signed-off-by: Henri Verbeet