Commit 8b8c3503 authored by Matteo Bruni's avatar Matteo Bruni Committed by Alexandre Julliard

d3d9/tests: Clarify that D3DFMT_A8R8G8B8 isn't a supported adapter format.

parent cc3d8ec6
...@@ -11671,11 +11671,6 @@ static void test_swapchain_parameters(void) ...@@ -11671,11 +11671,6 @@ static void test_swapchain_parameters(void)
static void test_check_device_format(void) static void test_check_device_format(void)
{ {
static const D3DFORMAT adapter_formats[] =
{
D3DFMT_A8R8G8B8,
D3DFMT_X8R8G8B8,
};
static const D3DFORMAT mipmap_autogen_formats[] = static const D3DFORMAT mipmap_autogen_formats[] =
{ {
D3DFMT_R8G8B8, D3DFMT_R8G8B8,
...@@ -11689,11 +11684,11 @@ static void test_check_device_format(void) ...@@ -11689,11 +11684,11 @@ static void test_check_device_format(void)
D3DFMT_A4R4G4B4, D3DFMT_A4R4G4B4,
}; };
D3DFORMAT adapter_format, format;
BOOL render_target_supported; BOOL render_target_supported;
D3DDEVTYPE device_type; D3DDEVTYPE device_type;
unsigned int i, j; D3DFORMAT format;
IDirect3D9 *d3d; IDirect3D9 *d3d;
unsigned int i;
HRESULT hr; HRESULT hr;
d3d = Direct3DCreate9(D3D_SDK_VERSION); d3d = Direct3DCreate9(D3D_SDK_VERSION);
...@@ -11750,29 +11745,32 @@ static void test_check_device_format(void) ...@@ -11750,29 +11745,32 @@ static void test_check_device_format(void)
D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16);
todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
for (i = 0; i < ARRAY_SIZE(adapter_formats); ++i) hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8,
{ 0, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8);
adapter_format = adapter_formats[i]; ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr);
hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
0, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8);
ok(hr == D3D_OK || broken(hr == D3DERR_NOTAVAILABLE) /* Testbot Windows <= 7 */,
"Got unexpected hr %#x.\n", hr);
for (j = 0; j < ARRAY_SIZE(mipmap_autogen_formats); ++j) for (i = 0; i < ARRAY_SIZE(mipmap_autogen_formats); ++i)
{ {
format = mipmap_autogen_formats[j]; format = mipmap_autogen_formats[i];
hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, adapter_format, hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, format); D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, format);
ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr);
render_target_supported = hr == D3D_OK; render_target_supported = hr == D3D_OK;
hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, adapter_format, hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
D3DUSAGE_RENDERTARGET | D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, format); D3DUSAGE_RENDERTARGET | D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, format);
if (render_target_supported) if (render_target_supported)
{ {
ok(hr == D3D_OK || hr == D3DOK_NOAUTOGEN, "Got unexpected hr %#x.\n", hr); ok(hr == D3D_OK || hr == D3DOK_NOAUTOGEN, "Got unexpected hr %#x.\n", hr);
} }
else else
{ {
ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr);
}
} }
} }
......
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