=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d9/tests: Remove redundant state setting calls.
Alexandre Julliard
julliard at winehq.org
Tue Jan 17 15:10:33 CST 2017
Module: wine
Branch: master
Commit: 14e24127833c2c125ec213c2501bbc76746f5242
URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e24127833c2c125ec213c2501bbc76746f5242
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Tue Jan 17 12:44:17 2017 +0100
d3d9/tests: Remove redundant state setting calls.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d9/tests/visual.c | 81 ------------------------------------------------
1 file changed, 81 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index 43c0cbc..4213779 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -21643,13 +21643,6 @@ static void test_line_antialiasing_blending(void)
HWND window;
HRESULT hr;
- static const D3DMATRIX mat =
- {{{
- 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,
- }}};
static const struct
{
struct vec3 position;
@@ -21690,22 +21683,10 @@ static void test_line_antialiasing_blending(void)
ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr);
trace("Line antialiasing support: %#x.\n", caps.LineCaps & D3DLINECAPS_ANTIALIAS);
- hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat);
- ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &mat);
- ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &mat);
- ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr);
hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE);
ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr);
hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE);
ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE);
- ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE);
- ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE);
- ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr);
hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE);
ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr);
@@ -21947,13 +21928,6 @@ static void test_evict_bound_resources(void)
void *data;
HRESULT hr;
- static const D3DMATRIX mat =
- {{{
- 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,
- }}};
static const struct
{
struct vec3 position;
@@ -21988,37 +21962,13 @@ static void test_evict_bound_resources(void)
D3DFVF_XYZ | D3DFVF_DIFFUSE, D3DPOOL_MANAGED, &vb, NULL);
ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat);
- ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &mat);
- ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &mat);
- ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr);
hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE);
ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr);
hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE);
ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE);
- ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE);
- ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE);
- ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr);
hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE);
ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE);
- ok(SUCCEEDED(hr), "Failed to disable blending, hr %#x.\n", hr);
-
- hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
- ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE);
- ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);
- ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE);
- ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr);
-
hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE);
ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr);
@@ -22075,13 +22025,6 @@ static void test_evict_bound_resources(void)
/* This test shows that 0xffff is valid index in D3D9. */
static void test_max_index16(void)
{
- static const D3DMATRIX mat =
- {{{
- 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,
- }}};
static const struct vertex
{
struct vec3 position;
@@ -22146,37 +22089,13 @@ static void test_max_index16(void)
D3DFMT_INDEX16, D3DPOOL_MANAGED, &ib, NULL);
ok(SUCCEEDED(hr), "Failed to create index buffer, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat);
- ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &mat);
- ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &mat);
- ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr);
hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE);
ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr);
hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE);
ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE);
- ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE);
- ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE);
- ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr);
hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE);
ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE);
- ok(SUCCEEDED(hr), "Failed to disable blending, hr %#x.\n", hr);
-
- hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
- ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE);
- ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);
- ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE);
- ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr);
-
hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE);
ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr);
More information about the wine-cvs
mailing list