[PATCH 5/6] d3d8: Add tests for D3DSBT_PIXELSTATE stateblocks.
Henri Verbeet
hverbeet at codeweavers.com
Fri Oct 9 02:58:50 CDT 2009
---
dlls/d3d8/tests/stateblock.c | 90 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 0 deletions(-)
diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c
index 5dbf0b0..423a1eb 100644
--- a/dlls/d3d8/tests/stateblock.c
+++ b/dlls/d3d8/tests/stateblock.c
@@ -121,6 +121,7 @@ struct state_test
const void *test_data_in;
const void *test_data_out_all;
const void *test_data_out_vertex;
+ const void *test_data_out_pixel;
/* Test resource management handlers */
HRESULT (*setup_handler)(struct state_test *test);
@@ -157,6 +158,7 @@ enum stateblock_data
SB_DATA_TEST_IN,
SB_DATA_TEST_ALL,
SB_DATA_TEST_VERTEX,
+ SB_DATA_TEST_PIXEL,
};
struct event
@@ -185,6 +187,9 @@ static const void *get_event_data(const struct state_test *test, enum stateblock
case SB_DATA_TEST_VERTEX:
return test->test_data_out_vertex;
+ case SB_DATA_TEST_PIXEL:
+ return test->test_data_out_pixel;
+
default:
return NULL;
}
@@ -322,6 +327,16 @@ static int create_stateblock_vertex(IDirect3DDevice8 *device, struct event_data
return EVENT_OK;
}
+static int create_stateblock_pixel(IDirect3DDevice8 *device, struct event_data *event_data)
+{
+ HRESULT hr;
+
+ hr = IDirect3DDevice8_CreateStateBlock(device, D3DSBT_PIXELSTATE, &event_data->stateblock);
+ ok(SUCCEEDED(hr), "CreateStateBlock returned %#x.\n", hr);
+ if (FAILED(hr)) return EVENT_ERROR;
+ return EVENT_OK;
+}
+
static int begin_stateblock(IDirect3DDevice8 *device, struct event_data *event_data)
{
HRESULT hr;
@@ -438,6 +453,20 @@ static void execute_test_chain_all(IDirect3DDevice8 *device, struct state_test *
{apply_stateblock, SB_DATA_TEST_VERTEX, SB_DATA_NONE},
};
+ struct event create_stateblock_capture_apply_pixel_events[] =
+ {
+ {create_stateblock_pixel, SB_DATA_DEFAULT, SB_DATA_TEST_IN},
+ {capture_stateblock, SB_DATA_TEST_ALL, SB_DATA_DEFAULT},
+ {apply_stateblock, SB_DATA_TEST_PIXEL, SB_DATA_NONE},
+ };
+
+ struct event create_stateblock_apply_pixel_events[] =
+ {
+ {NULL, SB_DATA_DEFAULT, SB_DATA_TEST_IN},
+ {create_stateblock_pixel, SB_DATA_TEST_ALL, SB_DATA_DEFAULT},
+ {apply_stateblock, SB_DATA_TEST_PIXEL, SB_DATA_NONE},
+ };
+
struct event rendertarget_switch_events[] =
{
{NULL, SB_DATA_NONE, SB_DATA_TEST_IN},
@@ -489,6 +518,12 @@ static void execute_test_chain_all(IDirect3DDevice8 *device, struct state_test *
trace("Running create stateblock apply vertex state tests\n");
execute_test_chain(device, test, ntests, create_stateblock_apply_vertex_events, 3, &arg);
+ trace("Running create stateblock capture/apply pixel state tests\n");
+ execute_test_chain(device, test, ntests, create_stateblock_capture_apply_pixel_events, 3, &arg);
+
+ trace("Running create stateblock apply pixel state tests\n");
+ execute_test_chain(device, test, ntests, create_stateblock_apply_pixel_events, 3, &arg);
+
trace("Running rendertarget switch state tests\n");
execute_test_chain(device, test, ntests, rendertarget_switch_events, 3, &arg);
@@ -589,10 +624,12 @@ static HRESULT shader_constant_setup_handler(struct state_test *test)
if (test_arg->pshader)
{
test->test_data_out_vertex = &shader_constant_default_data;
+ test->test_data_out_pixel = &shader_constant_test_data;
}
else
{
test->test_data_out_vertex = &shader_constant_test_data;
+ test->test_data_out_pixel = &shader_constant_default_data;
}
test->default_data = &shader_constant_default_data;
test->initial_data = &shader_constant_default_data;
@@ -809,6 +846,7 @@ static HRESULT light_setup_handler(struct state_test *test)
test->test_data_in = &light_test_data_in;
test->test_data_out_all = &light_test_data_out;
test->test_data_out_vertex = &light_test_data_out;
+ test->test_data_out_pixel = &light_default_data;
test->default_data = &light_default_data;
test->initial_data = &light_initial_data;
@@ -1059,6 +1097,7 @@ static HRESULT transform_setup_handler(struct state_test *test)
test->test_data_in = &transform_test_data;
test->test_data_out_all = &transform_test_data;
test->test_data_out_vertex = &transform_default_data;
+ test->test_data_out_pixel = &transform_default_data;
test->default_data = &transform_default_data;
test->initial_data = &transform_default_data;
@@ -1173,6 +1212,7 @@ struct render_state_context
struct render_state_data default_data_buffer;
struct render_state_data test_data_all_buffer;
struct render_state_data test_data_vertex_buffer;
+ struct render_state_data test_data_pixel_buffer;
struct render_state_data poison_data_buffer;
};
@@ -1416,6 +1456,45 @@ static HRESULT render_state_setup_handler(struct state_test *test)
D3DRS_VERTEXBLEND,
};
+ static const DWORD states_pixel[] =
+ {
+ D3DRS_ALPHABLENDENABLE,
+ D3DRS_ALPHAFUNC,
+ D3DRS_ALPHAREF,
+ D3DRS_ALPHATESTENABLE,
+ D3DRS_BLENDOP,
+ D3DRS_COLORWRITEENABLE,
+ D3DRS_DESTBLEND,
+ D3DRS_DITHERENABLE,
+ D3DRS_FILLMODE,
+ D3DRS_FOGDENSITY,
+ D3DRS_FOGEND,
+ D3DRS_FOGSTART,
+ D3DRS_LASTPIXEL,
+ D3DRS_SHADEMODE,
+ D3DRS_SRCBLEND,
+ D3DRS_STENCILENABLE,
+ D3DRS_STENCILFAIL,
+ D3DRS_STENCILFUNC,
+ D3DRS_STENCILMASK,
+ D3DRS_STENCILPASS,
+ D3DRS_STENCILREF,
+ D3DRS_STENCILWRITEMASK,
+ D3DRS_STENCILZFAIL,
+ D3DRS_TEXTUREFACTOR,
+ D3DRS_WRAP0,
+ D3DRS_WRAP1,
+ D3DRS_WRAP2,
+ D3DRS_WRAP3,
+ D3DRS_WRAP4,
+ D3DRS_WRAP5,
+ D3DRS_WRAP6,
+ D3DRS_WRAP7,
+ D3DRS_ZENABLE,
+ D3DRS_ZFUNC,
+ D3DRS_ZWRITEENABLE,
+ };
+
const struct render_state_arg *rsarg = test->test_arg;
unsigned int i, j;
@@ -1428,6 +1507,7 @@ static HRESULT render_state_setup_handler(struct state_test *test)
test->test_data_in = &ctx->test_data_all_buffer;
test->test_data_out_all = &ctx->test_data_all_buffer;
test->test_data_out_vertex = &ctx->test_data_vertex_buffer;
+ test->test_data_out_pixel = &ctx->test_data_pixel_buffer;
render_state_default_data_init(rsarg, &ctx->default_data_buffer);
render_state_test_data_init(&ctx->test_data_all_buffer);
@@ -1444,6 +1524,16 @@ static HRESULT render_state_setup_handler(struct state_test *test)
break;
}
}
+
+ ctx->test_data_pixel_buffer.states[i] = ctx->default_data_buffer.states[i];
+ for (j = 0; j < sizeof(states_pixel) / sizeof(*states_pixel); ++j)
+ {
+ if (render_state_indices[i] == states_pixel[j])
+ {
+ ctx->test_data_pixel_buffer.states[i] = ctx->test_data_all_buffer.states[i];
+ break;
+ }
+ }
}
return D3D_OK;
--
1.6.0.6
More information about the wine-patches
mailing list