Skip to content

W
wine-winehq
Commit dd72b43a authored by Matteo Bruni's avatar Matteo Bruni Committed by Alexandre Julliard
Browse files
Options

d3d11/tests: Add a feature_level parameter to init_test_context().

Signed-off-by: 's avatarMatteo Bruni <mbruni@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 64d16294
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 11 deletions
dlls/d3d11/tests/d3d11.c
View file @ dd72b43a
...@@ -320,15 +320,16 @@ struct d3d11_test_context ...@@ -320,15 +320,16 @@ struct d3d11_test_context
ID3D11Buffer *vb; ID3D11Buffer *vb;
}; };
#define init_test_context(c) init_test_context_(__LINE__, c) #define init_test_context(c, l) init_test_context_(__LINE__, c, l)
static BOOL init_test_context_(unsigned int line, struct d3d11_test_context *context) static BOOL init_test_context_(unsigned int line, struct d3d11_test_context *context,
const D3D_FEATURE_LEVEL *feature_level)
{ {
D3D11_VIEWPORT vp; D3D11_VIEWPORT vp;
HRESULT hr; HRESULT hr;
memset(context, 0, sizeof(*context)); memset(context, 0, sizeof(*context));
if (!(context->device = create_device(NULL))) if (!(context->device = create_device(feature_level)))
{ {
skip_(__FILE__, line)("Failed to create device.\n"); skip_(__FILE__, line)("Failed to create device.\n");
return FALSE; return FALSE;
...@@ -3187,7 +3188,7 @@ static void test_blend(void) ...@@ -3187,7 +3188,7 @@ static void test_blend(void)
static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f};
static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f};
if (!init_test_context(&test_context)) if (!init_test_context(&test_context, NULL))
return; return;
device = test_context.device; device = test_context.device;
...@@ -3756,7 +3757,7 @@ static void test_texture(void) ...@@ -3756,7 +3757,7 @@ static void test_texture(void)
{&ps_sample_l, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 2.0f, 2.0f, 2.0f, 9.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 2.0f, 2.0f, 2.0f, 9.0f, level_2_colors},
}; };
if (!init_test_context(&test_context)) if (!init_test_context(&test_context, NULL))
return; return;
device = test_context.device; device = test_context.device;
...@@ -4109,7 +4110,7 @@ static void test_scissor(void) ...@@ -4109,7 +4110,7 @@ static void test_scissor(void)
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
}; };
if (!init_test_context(&test_context)) if (!init_test_context(&test_context, NULL))
return; return;
device = test_context.device; device = test_context.device;
...@@ -4309,7 +4310,7 @@ static void test_il_append_aligned(void) ...@@ -4309,7 +4310,7 @@ static void test_il_append_aligned(void)
}; };
static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f};
if (!init_test_context(&test_context)) if (!init_test_context(&test_context, NULL))
return; return;
device = test_context.device; device = test_context.device;
...@@ -4445,7 +4446,7 @@ static void test_fragment_coords(void) ...@@ -4445,7 +4446,7 @@ static void test_fragment_coords(void)
static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f};
struct vec4 cutoff = {320.0f, 240.0f, 0.0f, 0.0f}; struct vec4 cutoff = {320.0f, 240.0f, 0.0f, 0.0f};
if (!init_test_context(&test_context)) if (!init_test_context(&test_context, NULL))
return; return;
device = test_context.device; device = test_context.device;
...@@ -4577,7 +4578,7 @@ static void test_update_subresource(void) ...@@ -4577,7 +4578,7 @@ static void test_update_subresource(void)
0xff000000, 0xff7f7f7f, 0xffffffff, 0x00000000, 0xff000000, 0xff7f7f7f, 0xffffffff, 0x00000000,
}; };
if (!init_test_context(&test_context)) if (!init_test_context(&test_context, NULL))
return; return;
device = test_context.device; device = test_context.device;
...@@ -4746,7 +4747,7 @@ static void test_copy_subresource_region(void) ...@@ -4746,7 +4747,7 @@ static void test_copy_subresource_region(void)
0xffffffff, 0xffffffff, 0xff000000, 0x00000000, 0xffffffff, 0xffffffff, 0xff000000, 0x00000000,
}; };
if (!init_test_context(&test_context)) if (!init_test_context(&test_context, NULL))
return; return;
device = test_context.device; device = test_context.device;
...@@ -5014,7 +5015,7 @@ static void test_multisample_init(void) ...@@ -5014,7 +5015,7 @@ static void test_multisample_init(void)
UINT count = 0; UINT count = 0;
HRESULT hr; HRESULT hr;
if (!init_test_context(&test_context)) if (!init_test_context(&test_context, NULL))
return; return;
device = test_context.device; device = test_context.device;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment