Signed-off-by: Józef Kucia jkucia@codeweavers.com --- dlls/dxgi/device.c | 11 +++++------ dlls/dxgi/dxgi_private.h | 6 ++++++ dlls/dxgi/factory.c | 2 +- dlls/dxgi/swapchain.c | 4 ++-- dlls/dxgi/utils.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 2539ca272606..b61d5abdb50a 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -169,24 +169,23 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac UINT i; UINT j;
- TRACE("iface %p, desc %p, surface_count %u, usage %#x, shared_resource %p, surface %p\n", + TRACE("iface %p, desc %p, surface_count %u, usage %#x, shared_resource %p, surface %p.\n", iface, desc, surface_count, usage, shared_resource, surface);
hr = IWineDXGIDevice_QueryInterface(iface, &IID_IWineDXGIDeviceParent, (void **)&dxgi_device_parent); if (FAILED(hr)) { - ERR("Device should implement IWineDXGIDeviceParent\n"); + ERR("Device should implement IWineDXGIDeviceParent.\n"); return E_FAIL; }
device_parent = IWineDXGIDeviceParent_get_wined3d_device_parent(dxgi_device_parent);
- FIXME("Implement DXGI<->wined3d usage conversion\n"); surface_desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; surface_desc.format = wined3dformat_from_dxgi_format(desc->Format); wined3d_sample_desc_from_dxgi(&surface_desc.multisample_type, &surface_desc.multisample_quality, &desc->SampleDesc); - surface_desc.usage = usage; + surface_desc.usage = wined3d_usage_from_dxgi_usage(usage); surface_desc.pool = WINED3D_POOL_DEFAULT; surface_desc.width = desc->Width; surface_desc.height = desc->Height; @@ -212,11 +211,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac wined3d_texture_decref(wined3d_texture); if (FAILED(hr)) { - ERR("Surface should implement IDXGISurface\n"); + ERR("Surface should implement IDXGISurface.\n"); goto fail; }
- TRACE("Created IDXGISurface %p (%u/%u)\n", surface[i], i + 1, surface_count); + TRACE("Created IDXGISurface %p (%u/%u).\n", surface[i], i + 1, surface_count); } wined3d_mutex_unlock(); IWineDXGIDeviceParent_Release(dxgi_device_parent); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index b8af8c361914..b97b67a7f951 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -38,6 +38,10 @@ #include "wine/wined3d.h" #include "wine/winedxgi.h"
+#ifndef ARRAY_SIZE +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) +#endif + enum dxgi_frame_latency { DXGI_FRAME_LATENCY_DEFAULT = 3, @@ -92,6 +96,8 @@ void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) DECLSPEC_HIDDEN; void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, const DXGI_MODE_DESC *mode) DECLSPEC_HIDDEN; +DXGI_USAGE dxgi_usage_from_wined3d_usage(DWORD wined3d_usage) DECLSPEC_HIDDEN; +DWORD wined3d_usage_from_dxgi_usage(DXGI_USAGE usage) DECLSPEC_HIDDEN; unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) DECLSPEC_HIDDEN; unsigned int wined3d_swapchain_flags_from_dxgi(unsigned int flags) DECLSPEC_HIDDEN; HRESULT dxgi_get_private_data(struct wined3d_private_store *store, diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 0020917ca693..8d2407895029 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -313,7 +313,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactor wined3d_desc.backbuffer_height = swapchain_desc->Height; wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(swapchain_desc->Format); wined3d_desc.backbuffer_count = swapchain_desc->BufferCount; - wined3d_desc.backbuffer_usage = WINED3DUSAGE_RENDERTARGET; + wined3d_desc.backbuffer_usage = wined3d_usage_from_dxgi_usage(swapchain_desc->BufferUsage); wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 2983ec59438c..66126f8940ea 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -295,7 +295,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain1 *iface, desc->BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; desc->BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; dxgi_sample_desc_from_wined3d(&desc->SampleDesc, wined3d_desc.multisample_type, wined3d_desc.multisample_quality); - desc->BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + desc->BufferUsage = dxgi_usage_from_wined3d_usage(wined3d_desc.backbuffer_usage); desc->BufferCount = wined3d_desc.backbuffer_count; desc->OutputWindow = wined3d_desc.device_window; desc->Windowed = wined3d_desc.windowed; @@ -452,7 +452,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc1(IDXGISwapChain1 *iface, desc->Stereo = FALSE; dxgi_sample_desc_from_wined3d(&desc->SampleDesc, wined3d_desc.multisample_type, wined3d_desc.multisample_quality); - desc->BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + desc->BufferUsage = dxgi_usage_from_wined3d_usage(wined3d_desc.backbuffer_usage); desc->BufferCount = wined3d_desc.backbuffer_count; desc->Scaling = DXGI_SCALING_STRETCH; desc->SwapEffect = DXGI_SWAP_EFFECT_DISCARD; diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index db74a487f2ee..a881746fb31b 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -453,6 +453,36 @@ void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, wined3d_mode->scanline_ordering = wined3d_scanline_ordering_from_dxgi(mode->ScanlineOrdering); }
+DXGI_USAGE dxgi_usage_from_wined3d_usage(DWORD wined3d_usage) +{ + DXGI_USAGE dxgi_usage = 0; + + if (wined3d_usage & WINED3DUSAGE_TEXTURE) + dxgi_usage |= DXGI_USAGE_SHADER_INPUT; + if (wined3d_usage & WINED3DUSAGE_RENDERTARGET) + dxgi_usage |= DXGI_USAGE_RENDER_TARGET_OUTPUT; + + wined3d_usage &= ~(WINED3DUSAGE_TEXTURE | WINED3DUSAGE_RENDERTARGET); + if (wined3d_usage) + FIXME("Unhandled wined3d usage %#x.\n", wined3d_usage); + return dxgi_usage; +} + +DWORD wined3d_usage_from_dxgi_usage(DXGI_USAGE dxgi_usage) +{ + DWORD wined3d_usage = 0; + + if (dxgi_usage & DXGI_USAGE_SHADER_INPUT) + wined3d_usage |= WINED3DUSAGE_TEXTURE; + if (dxgi_usage & DXGI_USAGE_RENDER_TARGET_OUTPUT) + wined3d_usage |= WINED3DUSAGE_RENDERTARGET; + + dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT); + if (dxgi_usage) + FIXME("Unhandled DXGI usage %#x.\n", dxgi_usage); + return wined3d_usage; +} + #define DXGI_WINED3D_SWAPCHAIN_FLAGS \ (WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE | WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT)