[PATCH v2 2/6] d3d11: Implement d3d10_device_CheckMultisampleQualityLevels().
Matteo Bruni
mbruni at codeweavers.com
Thu Feb 4 13:10:44 CST 2016
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
v2: Just forward to d3d11_device_CheckMultisampleQualityLevels(), thanks
Józef.
dlls/d3d10core/tests/device.c | 5 ++---
dlls/d3d11/device.c | 7 +++++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index b08041e..a0e4d9b 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -5044,7 +5044,7 @@ static void test_multisample_init(void)
}
hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count);
- todo_wine ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr);
if (!count)
{
skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping tests.\n");
@@ -5074,7 +5074,6 @@ static void test_multisample_init(void)
hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &multi);
ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)backbuffer, 0,
(ID3D10Resource *)multi, 0, DXGI_FORMAT_R8G8B8A8_UNORM);
@@ -5094,7 +5093,7 @@ static void test_multisample_init(void)
break;
}
release_texture_readback(&rb);
- ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y);
+ todo_wine ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y);
ID3D10RenderTargetView_Release(rtview);
ID3D10Texture2D_Release(backbuffer);
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index c4180d6..b3e8775 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -4503,10 +4503,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CheckFormatSupport(ID3D10Device1 *
static HRESULT STDMETHODCALLTYPE d3d10_device_CheckMultisampleQualityLevels(ID3D10Device1 *iface,
DXGI_FORMAT format, UINT sample_count, UINT *quality_level_count)
{
- FIXME("iface %p, format %s, sample_count %u, quality_level_count %p stub!\n",
+ struct d3d_device *device = impl_from_ID3D10Device(iface);
+
+ TRACE("iface %p, format %s, sample_count %u, quality_level_count %p.\n",
iface, debug_dxgi_format(format), sample_count, quality_level_count);
- return E_NOTIMPL;
+ return d3d11_device_CheckMultisampleQualityLevels(&device->ID3D11Device_iface, format,
+ sample_count, quality_level_count);
}
static void STDMETHODCALLTYPE d3d10_device_CheckCounterInfo(ID3D10Device1 *iface, D3D10_COUNTER_INFO *counter_info)
--
2.4.10
More information about the wine-patches
mailing list