* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
#include "d3d9_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
-
-static inline IDirect3D9Impl *impl_from_IDirect3D9Ex(IDirect3D9Ex *iface)
+static inline struct d3d9 *impl_from_IDirect3D9Ex(IDirect3D9Ex *iface)
{
- return CONTAINING_RECORD(iface, IDirect3D9Impl, IDirect3D9Ex_iface);
+ return CONTAINING_RECORD(iface, struct d3d9, IDirect3D9Ex_iface);
}
-static HRESULT WINAPI IDirect3D9Impl_QueryInterface(IDirect3D9Ex *iface, REFIID riid, void **ppobj)
+static HRESULT WINAPI d3d9_QueryInterface(IDirect3D9Ex *iface, REFIID riid, void **out)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
- TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj);
+ TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
- if (IsEqualGUID(riid, &IID_IUnknown)
- || IsEqualGUID(riid, &IID_IDirect3D9)) {
- IDirect3D9Ex_AddRef(iface);
- *ppobj = This;
- TRACE("Returning IDirect3D9 interface at %p\n", *ppobj);
+ if (IsEqualGUID(riid, &IID_IDirect3D9)
+ || IsEqualGUID(riid, &IID_IUnknown))
+ {
+ IDirect3D9Ex_AddRef(&d3d9->IDirect3D9Ex_iface);
+ *out = &d3d9->IDirect3D9Ex_iface;
return S_OK;
- } else if(IsEqualGUID(riid, &IID_IDirect3D9Ex)) {
- if(This->extended) {
- *ppobj = This;
- TRACE("Returning IDirect3D9Ex interface at %p\n", *ppobj);
- IDirect3D9Ex_AddRef((IDirect3D9Ex *)*ppobj);
- } else {
- WARN("Application asks for IDirect3D9Ex, but this instance wasn't created with Direct3DCreate9Ex\n");
- WARN("Returning E_NOINTERFACE\n");
- *ppobj = NULL;
+ }
+
+ if (IsEqualGUID(riid, &IID_IDirect3D9Ex))
+ {
+ if (!d3d9->extended)
+ {
+ WARN("Application asks for IDirect3D9Ex, but this instance wasn't created with Direct3DCreate9Ex.\n");
+ *out = NULL;
return E_NOINTERFACE;
}
+
+ IDirect3D9Ex_AddRef(&d3d9->IDirect3D9Ex_iface);
+ *out = &d3d9->IDirect3D9Ex_iface;
+ return S_OK;
}
- WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj);
- *ppobj = NULL;
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
+
+ *out = NULL;
return E_NOINTERFACE;
}
-static ULONG WINAPI IDirect3D9Impl_AddRef(IDirect3D9Ex *iface)
+static ULONG WINAPI d3d9_AddRef(IDirect3D9Ex *iface)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
- ULONG ref = InterlockedIncrement(&This->ref);
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
+ ULONG refcount = InterlockedIncrement(&d3d9->refcount);
- TRACE("%p increasing refcount to %u.\n", iface, ref);
+ TRACE("%p increasing refcount to %u.\n", iface, refcount);
- return ref;
+ return refcount;
}
-static ULONG WINAPI IDirect3D9Impl_Release(IDirect3D9Ex *iface)
+static ULONG WINAPI d3d9_Release(IDirect3D9Ex *iface)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
- ULONG ref = InterlockedDecrement(&This->ref);
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
+ ULONG refcount = InterlockedDecrement(&d3d9->refcount);
- TRACE("%p decreasing refcount to %u.\n", iface, ref);
+ TRACE("%p decreasing refcount to %u.\n", iface, refcount);
- if (ref == 0) {
+ if (!refcount)
+ {
wined3d_mutex_lock();
- wined3d_decref(This->WineD3D);
+ wined3d_decref(d3d9->wined3d);
wined3d_mutex_unlock();
- HeapFree(GetProcessHeap(), 0, This);
+ HeapFree(GetProcessHeap(), 0, d3d9);
}
- return ref;
+ return refcount;
}
-/* IDirect3D9 Interface follow: */
-static HRESULT WINAPI IDirect3D9Impl_RegisterSoftwareDevice(IDirect3D9Ex *iface,
- void *pInitializeFunction)
+static HRESULT WINAPI d3d9_RegisterSoftwareDevice(IDirect3D9Ex *iface, void *init_function)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
HRESULT hr;
- TRACE("iface %p, init_function %p.\n", iface, pInitializeFunction);
+ TRACE("iface %p, init_function %p.\n", iface, init_function);
wined3d_mutex_lock();
- hr = wined3d_register_software_device(This->WineD3D, pInitializeFunction);
+ hr = wined3d_register_software_device(d3d9->wined3d, init_function);
wined3d_mutex_unlock();
return hr;
}
-static UINT WINAPI IDirect3D9Impl_GetAdapterCount(IDirect3D9Ex *iface)
+static UINT WINAPI d3d9_GetAdapterCount(IDirect3D9Ex *iface)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
- HRESULT hr;
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
+ UINT ret;
TRACE("iface %p.\n", iface);
wined3d_mutex_lock();
- hr = wined3d_get_adapter_count(This->WineD3D);
+ ret = wined3d_get_adapter_count(d3d9->wined3d);
wined3d_mutex_unlock();
- return hr;
+ return ret;
}
-static HRESULT WINAPI IDirect3D9Impl_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT Adapter,
- DWORD Flags, D3DADAPTER_IDENTIFIER9 *pIdentifier)
+static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapter,
+ DWORD flags, D3DADAPTER_IDENTIFIER9 *identifier)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
- WINED3DADAPTER_IDENTIFIER adapter_id;
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
+ struct wined3d_adapter_identifier adapter_id;
HRESULT hr;
TRACE("iface %p, adapter %u, flags %#x, identifier %p.\n",
- iface, Adapter, Flags, pIdentifier);
+ iface, adapter, flags, identifier);
- adapter_id.driver = pIdentifier->Driver;
- adapter_id.driver_size = sizeof(pIdentifier->Driver);
- adapter_id.description = pIdentifier->Description;
- adapter_id.description_size = sizeof(pIdentifier->Description);
- adapter_id.device_name = pIdentifier->DeviceName;
- adapter_id.device_name_size = sizeof(pIdentifier->DeviceName);
+ adapter_id.driver = identifier->Driver;
+ adapter_id.driver_size = sizeof(identifier->Driver);
+ adapter_id.description = identifier->Description;
+ adapter_id.description_size = sizeof(identifier->Description);
+ adapter_id.device_name = identifier->DeviceName;
+ adapter_id.device_name_size = sizeof(identifier->DeviceName);
wined3d_mutex_lock();
- hr = wined3d_get_adapter_identifier(This->WineD3D, Adapter, Flags, &adapter_id);
+ hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, flags, &adapter_id);
wined3d_mutex_unlock();
- pIdentifier->DriverVersion = adapter_id.driver_version;
- pIdentifier->VendorId = adapter_id.vendor_id;
- pIdentifier->DeviceId = adapter_id.device_id;
- pIdentifier->SubSysId = adapter_id.subsystem_id;
- pIdentifier->Revision = adapter_id.revision;
- memcpy(&pIdentifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(pIdentifier->DeviceIdentifier));
- pIdentifier->WHQLLevel = adapter_id.whql_level;
+ identifier->DriverVersion = adapter_id.driver_version;
+ identifier->VendorId = adapter_id.vendor_id;
+ identifier->DeviceId = adapter_id.device_id;
+ identifier->SubSysId = adapter_id.subsystem_id;
+ identifier->Revision = adapter_id.revision;
+ memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier));
+ identifier->WHQLLevel = adapter_id.whql_level;
return hr;
}
-static UINT WINAPI IDirect3D9Impl_GetAdapterModeCount(IDirect3D9Ex *iface, UINT Adapter,
- D3DFORMAT Format)
+static UINT WINAPI d3d9_GetAdapterModeCount(IDirect3D9Ex *iface, UINT adapter, D3DFORMAT format)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
- HRESULT hr;
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
+ UINT ret;
- TRACE("iface %p, adapter %u, format %#x.\n", iface, Adapter, Format);
+ TRACE("iface %p, adapter %u, format %#x.\n", iface, adapter, format);
- /* Others than that not supported by d3d9, but reported by wined3d for ddraw. Filter them out */
- if(Format != D3DFMT_X8R8G8B8 && Format != D3DFMT_R5G6B5) {
+ /* Others than that not supported by d3d9, but reported by wined3d for ddraw. Filter them out. */
+ if (format != D3DFMT_X8R8G8B8 && format != D3DFMT_R5G6B5)
return 0;
- }
wined3d_mutex_lock();
- hr = wined3d_get_adapter_mode_count(This->WineD3D, Adapter, wined3dformat_from_d3dformat(Format));
+ ret = wined3d_get_adapter_mode_count(d3d9->wined3d, adapter,
+ wined3dformat_from_d3dformat(format), WINED3D_SCANLINE_ORDERING_UNKNOWN);
wined3d_mutex_unlock();
- return hr;
+ return ret;
}
-static HRESULT WINAPI IDirect3D9Impl_EnumAdapterModes(IDirect3D9Ex *iface, UINT Adapter,
- D3DFORMAT Format, UINT Mode, D3DDISPLAYMODE *pMode)
+static HRESULT WINAPI d3d9_EnumAdapterModes(IDirect3D9Ex *iface, UINT adapter,
+ D3DFORMAT format, UINT mode_idx, D3DDISPLAYMODE *mode)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
+ struct wined3d_display_mode wined3d_mode;
HRESULT hr;
TRACE("iface %p, adapter %u, format %#x, mode_idx %u, mode %p.\n",
- iface, Adapter, Format, Mode, pMode);
+ iface, adapter, format, mode_idx, mode);
- /* We can't pass this to WineD3D, otherwise it'll think it came from D3D8 or DDraw.
- It's supposed to fail anyway, so no harm returning failure. */
- if(Format != D3DFMT_X8R8G8B8 && Format != D3DFMT_R5G6B5)
+ if (format != D3DFMT_X8R8G8B8 && format != D3DFMT_R5G6B5)
return D3DERR_INVALIDCALL;
wined3d_mutex_lock();
- hr = wined3d_enum_adapter_modes(This->WineD3D, Adapter, wined3dformat_from_d3dformat(Format),
- Mode, (WINED3DDISPLAYMODE *) pMode);
+ hr = wined3d_enum_adapter_modes(d3d9->wined3d, adapter, wined3dformat_from_d3dformat(format),
+ WINED3D_SCANLINE_ORDERING_UNKNOWN, mode_idx, &wined3d_mode);
wined3d_mutex_unlock();
- if (SUCCEEDED(hr)) pMode->Format = d3dformat_from_wined3dformat(pMode->Format);
+ if (SUCCEEDED(hr))
+ {
+ mode->Width = wined3d_mode.width;
+ mode->Height = wined3d_mode.height;
+ mode->RefreshRate = wined3d_mode.refresh_rate;
+ mode->Format = d3dformat_from_wined3dformat(wined3d_mode.format_id);
+ }
return hr;
}
-static HRESULT WINAPI IDirect3D9Impl_GetAdapterDisplayMode(IDirect3D9Ex *iface, UINT Adapter,
- D3DDISPLAYMODE *pMode)
+static HRESULT WINAPI d3d9_GetAdapterDisplayMode(IDirect3D9Ex *iface, UINT adapter, D3DDISPLAYMODE *mode)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
+ struct wined3d_display_mode wined3d_mode;
HRESULT hr;
- TRACE("iface %p, adapter %u, mode %p.\n", iface, Adapter, pMode);
+ TRACE("iface %p, adapter %u, mode %p.\n", iface, adapter, mode);
wined3d_mutex_lock();
- hr = wined3d_get_adapter_display_mode(This->WineD3D, Adapter, (WINED3DDISPLAYMODE *)pMode);
+ hr = wined3d_get_adapter_display_mode(d3d9->wined3d, adapter, &wined3d_mode, NULL);
wined3d_mutex_unlock();
- if (SUCCEEDED(hr)) pMode->Format = d3dformat_from_wined3dformat(pMode->Format);
+ if (SUCCEEDED(hr))
+ {
+ mode->Width = wined3d_mode.width;
+ mode->Height = wined3d_mode.height;
+ mode->RefreshRate = wined3d_mode.refresh_rate;
+ mode->Format = d3dformat_from_wined3dformat(wined3d_mode.format_id);
+ }
return hr;
}
-static HRESULT WINAPI IDirect3D9Impl_CheckDeviceType(IDirect3D9Ex *iface, UINT Adapter,
- D3DDEVTYPE CheckType, D3DFORMAT DisplayFormat, D3DFORMAT BackBufferFormat, BOOL Windowed)
+static HRESULT WINAPI d3d9_CheckDeviceType(IDirect3D9Ex *iface, UINT adapter, D3DDEVTYPE device_type,
+ D3DFORMAT display_format, D3DFORMAT backbuffer_format, BOOL windowed)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
HRESULT hr;
TRACE("iface %p, adapter %u, device_type %#x, display_format %#x, backbuffer_format %#x, windowed %#x.\n",
- iface, Adapter, CheckType, DisplayFormat, BackBufferFormat, Windowed);
+ iface, adapter, device_type, display_format, backbuffer_format, windowed);
+
+ /* Others than that not supported by d3d9, but reported by wined3d for ddraw. Filter them out. */
+ if (!windowed && display_format != D3DFMT_X8R8G8B8 && display_format != D3DFMT_R5G6B5)
+ return WINED3DERR_NOTAVAILABLE;
wined3d_mutex_lock();
- hr = wined3d_check_device_type(This->WineD3D, Adapter, CheckType, wined3dformat_from_d3dformat(DisplayFormat),
- wined3dformat_from_d3dformat(BackBufferFormat), Windowed);
+ hr = wined3d_check_device_type(d3d9->wined3d, adapter, device_type, wined3dformat_from_d3dformat(display_format),
+ wined3dformat_from_d3dformat(backbuffer_format), windowed);
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormat(IDirect3D9Ex *iface, UINT Adapter,
- D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, DWORD Usage, D3DRESOURCETYPE RType,
- D3DFORMAT CheckFormat)
+static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter, D3DDEVTYPE device_type,
+ D3DFORMAT adapter_format, DWORD usage, D3DRESOURCETYPE resource_type, D3DFORMAT format)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
+ enum wined3d_resource_type wined3d_rtype;
HRESULT hr;
- WINED3DRESOURCETYPE WineD3DRType;
TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.\n",
- iface, Adapter, DeviceType, AdapterFormat, Usage, RType, CheckFormat);
-
- /* This format is nothing special and it is supported perfectly.
- * However, ati and nvidia driver on windows do not mark this format as
- * supported (tested with the dxCapsViewer) and pretending to
- * support this format uncovers a bug in Battlefield 1942 (fonts are missing)
- * So do the same as Windows drivers and pretend not to support it on dx8 and 9
- */
- if(CheckFormat == D3DFMT_R8G8B8)
+ iface, adapter, device_type, adapter_format, usage, resource_type, format);
+
+ usage = usage & (WINED3DUSAGE_MASK | WINED3DUSAGE_QUERY_MASK);
+ switch (resource_type)
{
- WARN("D3DFMT_R8G8B8 is not available on windows, returning D3DERR_NOTAVAILABLE\n");
- return D3DERR_NOTAVAILABLE;
- }
+ case D3DRTYPE_CUBETEXTURE:
+ usage |= WINED3DUSAGE_LEGACY_CUBEMAP;
+ case D3DRTYPE_TEXTURE:
+ usage |= WINED3DUSAGE_TEXTURE;
+ case D3DRTYPE_SURFACE:
+ wined3d_rtype = WINED3D_RTYPE_TEXTURE_2D;
+ break;
+
+ case D3DRTYPE_VOLUMETEXTURE:
+ case D3DRTYPE_VOLUME:
+ usage |= WINED3DUSAGE_TEXTURE;
+ wined3d_rtype = WINED3D_RTYPE_TEXTURE_3D;
+ break;
- switch(RType) {
case D3DRTYPE_VERTEXBUFFER:
case D3DRTYPE_INDEXBUFFER:
- WineD3DRType = WINED3DRTYPE_BUFFER;
+ wined3d_rtype = WINED3D_RTYPE_BUFFER;
break;
default:
- WineD3DRType = RType;
- break;
+ FIXME("Unhandled resource type %#x.\n", resource_type);
+ return WINED3DERR_INVALIDCALL;
}
wined3d_mutex_lock();
- hr = wined3d_check_device_format(This->WineD3D, Adapter, DeviceType, wined3dformat_from_d3dformat(AdapterFormat),
- Usage, WineD3DRType, wined3dformat_from_d3dformat(CheckFormat), SURFACE_OPENGL);
+ hr = wined3d_check_device_format(d3d9->wined3d, adapter, device_type, wined3dformat_from_d3dformat(adapter_format),
+ usage, wined3d_rtype, wined3dformat_from_d3dformat(format));
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI IDirect3D9Impl_CheckDeviceMultiSampleType(IDirect3D9Ex *iface, UINT Adapter,
- D3DDEVTYPE DeviceType, D3DFORMAT SurfaceFormat, BOOL Windowed,
- D3DMULTISAMPLE_TYPE MultiSampleType, DWORD *pQualityLevels)
+static HRESULT WINAPI d3d9_CheckDeviceMultiSampleType(IDirect3D9Ex *iface, UINT adapter, D3DDEVTYPE device_type,
+ D3DFORMAT format, BOOL windowed, D3DMULTISAMPLE_TYPE multisample_type, DWORD *levels)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
HRESULT hr;
TRACE("iface %p, adapter %u, device_type %#x, format %#x, windowed %#x, multisample_type %#x, levels %p.\n",
- iface, Adapter, DeviceType, SurfaceFormat, Windowed, MultiSampleType, pQualityLevels);
+ iface, adapter, device_type, format, windowed, multisample_type, levels);
+
+ if (multisample_type > D3DMULTISAMPLE_16_SAMPLES)
+ return D3DERR_INVALIDCALL;
wined3d_mutex_lock();
- hr = wined3d_check_device_multisample_type(This->WineD3D, Adapter, DeviceType,
- wined3dformat_from_d3dformat(SurfaceFormat), Windowed, MultiSampleType, pQualityLevels);
+ hr = wined3d_check_device_multisample_type(d3d9->wined3d, adapter, device_type,
+ wined3dformat_from_d3dformat(format), windowed, multisample_type, levels);
wined3d_mutex_unlock();
+ if (hr == WINED3DERR_NOTAVAILABLE && levels)
+ *levels = 1;
return hr;
}
-static HRESULT WINAPI IDirect3D9Impl_CheckDepthStencilMatch(IDirect3D9Ex *iface, UINT Adapter,
- D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, D3DFORMAT RenderTargetFormat,
- D3DFORMAT DepthStencilFormat)
+static HRESULT WINAPI d3d9_CheckDepthStencilMatch(IDirect3D9Ex *iface, UINT adapter, D3DDEVTYPE device_type,
+ D3DFORMAT adapter_format, D3DFORMAT rt_format, D3DFORMAT ds_format)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
HRESULT hr;
TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, rt_format %#x, ds_format %#x.\n",
- iface, Adapter, DeviceType, AdapterFormat, RenderTargetFormat, DepthStencilFormat);
+ iface, adapter, device_type, adapter_format, rt_format, ds_format);
wined3d_mutex_lock();
- hr = wined3d_check_depth_stencil_match(This->WineD3D, Adapter, DeviceType,
- wined3dformat_from_d3dformat(AdapterFormat), wined3dformat_from_d3dformat(RenderTargetFormat),
- wined3dformat_from_d3dformat(DepthStencilFormat));
+ hr = wined3d_check_depth_stencil_match(d3d9->wined3d, adapter, device_type,
+ wined3dformat_from_d3dformat(adapter_format), wined3dformat_from_d3dformat(rt_format),
+ wined3dformat_from_d3dformat(ds_format));
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormatConversion(IDirect3D9Ex *iface, UINT Adapter,
- D3DDEVTYPE DeviceType, D3DFORMAT SourceFormat, D3DFORMAT TargetFormat)
+static HRESULT WINAPI d3d9_CheckDeviceFormatConversion(IDirect3D9Ex *iface, UINT adapter,
+ D3DDEVTYPE device_type, D3DFORMAT src_format, D3DFORMAT dst_format)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
HRESULT hr;
TRACE("iface %p, adapter %u, device_type %#x, src_format %#x, dst_format %#x.\n",
- iface, Adapter, DeviceType, SourceFormat, TargetFormat);
+ iface, adapter, device_type, src_format, dst_format);
wined3d_mutex_lock();
- hr = wined3d_check_device_format_conversion(This->WineD3D, Adapter, DeviceType,
- wined3dformat_from_d3dformat(SourceFormat), wined3dformat_from_d3dformat(TargetFormat));
+ hr = wined3d_check_device_format_conversion(d3d9->wined3d, adapter, device_type,
+ wined3dformat_from_d3dformat(src_format), wined3dformat_from_d3dformat(dst_format));
wined3d_mutex_unlock();
return hr;
}
-void filter_caps(D3DCAPS9* pCaps)
+static HRESULT WINAPI d3d9_GetDeviceCaps(IDirect3D9Ex *iface, UINT adapter, D3DDEVTYPE device_type, D3DCAPS9 *caps)
{
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
+ WINED3DCAPS wined3d_caps;
+ HRESULT hr;
- DWORD textureFilterCaps =
- D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR | D3DPTFILTERCAPS_MINFANISOTROPIC |
- D3DPTFILTERCAPS_MINFPYRAMIDALQUAD | D3DPTFILTERCAPS_MINFGAUSSIANQUAD|
- D3DPTFILTERCAPS_MIPFPOINT | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT |
- D3DPTFILTERCAPS_MAGFLINEAR |D3DPTFILTERCAPS_MAGFANISOTROPIC|D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD|
- D3DPTFILTERCAPS_MAGFGAUSSIANQUAD;
- pCaps->TextureFilterCaps &= textureFilterCaps;
- pCaps->CubeTextureFilterCaps &= textureFilterCaps;
- pCaps->VolumeTextureFilterCaps &= textureFilterCaps;
-
- pCaps->DevCaps &=
- D3DDEVCAPS_EXECUTESYSTEMMEMORY | D3DDEVCAPS_EXECUTEVIDEOMEMORY | D3DDEVCAPS_TLVERTEXSYSTEMMEMORY |
- D3DDEVCAPS_TLVERTEXVIDEOMEMORY | D3DDEVCAPS_TEXTURESYSTEMMEMORY| D3DDEVCAPS_TEXTUREVIDEOMEMORY |
- D3DDEVCAPS_DRAWPRIMTLVERTEX | D3DDEVCAPS_CANRENDERAFTERFLIP | D3DDEVCAPS_TEXTURENONLOCALVIDMEM|
- D3DDEVCAPS_DRAWPRIMITIVES2 | D3DDEVCAPS_SEPARATETEXTUREMEMORIES |
- D3DDEVCAPS_DRAWPRIMITIVES2EX | D3DDEVCAPS_HWTRANSFORMANDLIGHT| D3DDEVCAPS_CANBLTSYSTONONLOCAL |
- D3DDEVCAPS_HWRASTERIZATION | D3DDEVCAPS_PUREDEVICE | D3DDEVCAPS_QUINTICRTPATCHES |
- D3DDEVCAPS_RTPATCHES | D3DDEVCAPS_RTPATCHHANDLEZERO | D3DDEVCAPS_NPATCHES;
-
- pCaps->ShadeCaps &=
- D3DPSHADECAPS_COLORGOURAUDRGB | D3DPSHADECAPS_SPECULARGOURAUDRGB |
- D3DPSHADECAPS_ALPHAGOURAUDBLEND | D3DPSHADECAPS_FOGGOURAUD;
-
- pCaps->RasterCaps &=
- D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ZTEST | D3DPRASTERCAPS_FOGVERTEX |
- D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR |
- D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER |
- D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE |
- D3DPRASTERCAPS_SCISSORTEST | D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS |
- D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE;
-
- pCaps->DevCaps2 &=
- D3DDEVCAPS2_STREAMOFFSET | D3DDEVCAPS2_DMAPNPATCH | D3DDEVCAPS2_ADAPTIVETESSRTPATCH |
- D3DDEVCAPS2_ADAPTIVETESSNPATCH | D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES |
- D3DDEVCAPS2_PRESAMPLEDDMAPNPATCH| D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET;
-
- pCaps->Caps2 &=
- D3DCAPS2_FULLSCREENGAMMA | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED |
- D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP;
-
- pCaps->VertexProcessingCaps &=
- D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 | D3DVTXPCAPS_DIRECTIONALLIGHTS |
- D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER | D3DVTXPCAPS_TWEENING |
- D3DVTXPCAPS_TEXGEN_SPHEREMAP | D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER;
-
- pCaps->TextureCaps &=
- D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_ALPHA |
- D3DPTEXTURECAPS_SQUAREONLY | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE |
- D3DPTEXTURECAPS_ALPHAPALETTE | D3DPTEXTURECAPS_NONPOW2CONDITIONAL |
- D3DPTEXTURECAPS_PROJECTED | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP |
- D3DPTEXTURECAPS_MIPMAP | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP |
- D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2| D3DPTEXTURECAPS_NOPROJECTEDBUMPENV;
-
- pCaps->MaxVertexShaderConst = min(D3D9_MAX_VERTEX_SHADER_CONSTANTF, pCaps->MaxVertexShaderConst);
- pCaps->NumSimultaneousRTs = min(D3D9_MAX_SIMULTANEOUS_RENDERTARGETS, pCaps->NumSimultaneousRTs);
-}
-
-static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(IDirect3D9Ex *iface, UINT Adapter,
- D3DDEVTYPE DeviceType, D3DCAPS9 *pCaps)
-{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
- HRESULT hrc = D3D_OK;
- WINED3DCAPS *pWineCaps;
-
- TRACE("iface %p, adapter %u, device_type %#x, caps %p.\n", iface, Adapter, DeviceType, pCaps);
+ TRACE("iface %p, adapter %u, device_type %#x, caps %p.\n", iface, adapter, device_type, caps);
- if(NULL == pCaps){
+ if (!caps)
return D3DERR_INVALIDCALL;
- }
- pWineCaps = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINED3DCAPS));
- if(pWineCaps == NULL){
- return D3DERR_INVALIDCALL; /*well this is what MSDN says to return*/
- }
- memset(pCaps, 0, sizeof(*pCaps));
+
+ memset(caps, 0, sizeof(*caps));
wined3d_mutex_lock();
- hrc = wined3d_get_device_caps(This->WineD3D, Adapter, DeviceType, pWineCaps);
+ hr = wined3d_get_device_caps(d3d9->wined3d, adapter, device_type, &wined3d_caps);
wined3d_mutex_unlock();
- WINECAPSTOD3D9CAPS(pCaps, pWineCaps)
- HeapFree(GetProcessHeap(), 0, pWineCaps);
+ d3dcaps_from_wined3dcaps(caps, &wined3d_caps);
- /* Some functionality is implemented in d3d9.dll, not wined3d.dll. Add the needed caps */
- pCaps->DevCaps2 |= D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES;
-
- filter_caps(pCaps);
-
- TRACE("(%p) returning %p\n", This, pCaps);
- return hrc;
+ return hr;
}
-static HMONITOR WINAPI IDirect3D9Impl_GetAdapterMonitor(IDirect3D9Ex *iface, UINT Adapter)
+static HMONITOR WINAPI d3d9_GetAdapterMonitor(IDirect3D9Ex *iface, UINT adapter)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
- HMONITOR ret;
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
+ struct wined3d_output_desc desc;
+ HRESULT hr;
- TRACE("iface %p, adapter %u.\n", iface, Adapter);
+ TRACE("iface %p, adapter %u.\n", iface, adapter);
wined3d_mutex_lock();
- ret = wined3d_get_adapter_monitor(This->WineD3D, Adapter);
+ hr = wined3d_get_output_desc(d3d9->wined3d, adapter, &desc);
wined3d_mutex_unlock();
- return ret;
+ if (FAILED(hr))
+ {
+ WARN("Failed to get output desc, hr %#x.\n", hr);
+ return NULL;
+ }
+
+ return desc.monitor;
}
-static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9Impl_CreateDevice(IDirect3D9Ex *iface, UINT adapter,
+static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDevice(IDirect3D9Ex *iface, UINT adapter,
D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters,
IDirect3DDevice9 **device)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
- IDirect3DDevice9Impl *object;
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
+ struct d3d9_device *object;
HRESULT hr;
TRACE("iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x, parameters %p, device %p.\n",
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
if (!object)
- {
- ERR("Failed to allocate device memory.\n");
return E_OUTOFMEMORY;
- }
- hr = device_init(object, This->WineD3D, adapter, device_type, focus_window, flags, parameters, NULL);
+ hr = device_init(object, d3d9, d3d9->wined3d, adapter, device_type, focus_window, flags, parameters, NULL);
if (FAILED(hr))
{
WARN("Failed to initialize device, hr %#x.\n", hr);
}
TRACE("Created device %p.\n", object);
- *device = (IDirect3DDevice9 *)object;
+ *device = (IDirect3DDevice9 *)&object->IDirect3DDevice9Ex_iface;
return D3D_OK;
}
-static UINT WINAPI IDirect3D9ExImpl_GetAdapterModeCountEx(IDirect3D9Ex *iface,
+static UINT WINAPI d3d9_GetAdapterModeCountEx(IDirect3D9Ex *iface,
UINT adapter, const D3DDISPLAYMODEFILTER *filter)
{
- FIXME("iface %p, adapter %u, filter %p stub!\n", iface, adapter, filter);
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
+ UINT ret;
+
+ TRACE("iface %p, adapter %u, filter %p.\n", iface, adapter, filter);
+
+ if (filter->Format != D3DFMT_X8R8G8B8 && filter->Format != D3DFMT_R5G6B5)
+ return 0;
- return E_NOTIMPL;
+ wined3d_mutex_lock();
+ ret = wined3d_get_adapter_mode_count(d3d9->wined3d, adapter,
+ wined3dformat_from_d3dformat(filter->Format), filter->ScanLineOrdering);
+ wined3d_mutex_unlock();
+
+ return ret;
}
-static HRESULT WINAPI IDirect3D9ExImpl_EnumAdapterModesEx(IDirect3D9Ex *iface,
+static HRESULT WINAPI d3d9_EnumAdapterModesEx(IDirect3D9Ex *iface,
UINT adapter, const D3DDISPLAYMODEFILTER *filter, UINT mode_idx, D3DDISPLAYMODEEX *mode)
{
- FIXME("iface %p, adapter %u, filter %p, mode_idx %u, mode %p stub!\n",
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
+ struct wined3d_display_mode wined3d_mode;
+ HRESULT hr;
+
+ TRACE("iface %p, adapter %u, filter %p, mode_idx %u, mode %p.\n",
iface, adapter, filter, mode_idx, mode);
- return E_NOTIMPL;
+ if (filter->Format != D3DFMT_X8R8G8B8 && filter->Format != D3DFMT_R5G6B5)
+ return D3DERR_INVALIDCALL;
+
+ wined3d_mutex_lock();
+ hr = wined3d_enum_adapter_modes(d3d9->wined3d, adapter, wined3dformat_from_d3dformat(filter->Format),
+ filter->ScanLineOrdering, mode_idx, &wined3d_mode);
+ wined3d_mutex_unlock();
+
+ if (SUCCEEDED(hr))
+ {
+ mode->Width = wined3d_mode.width;
+ mode->Height = wined3d_mode.height;
+ mode->RefreshRate = wined3d_mode.refresh_rate;
+ mode->Format = d3dformat_from_wined3dformat(wined3d_mode.format_id);
+ mode->ScanLineOrdering = wined3d_mode.scanline_ordering;
+ }
+
+ return hr;
}
-static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterDisplayModeEx(IDirect3D9Ex *iface,
+static HRESULT WINAPI d3d9_GetAdapterDisplayModeEx(IDirect3D9Ex *iface,
UINT adapter, D3DDISPLAYMODEEX *mode, D3DDISPLAYROTATION *rotation)
{
- FIXME("iface %p, adapter %u, mode %p, rotation %p stub!\n",
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
+ struct wined3d_display_mode wined3d_mode;
+ HRESULT hr;
+
+ TRACE("iface %p, adapter %u, mode %p, rotation %p.\n",
iface, adapter, mode, rotation);
- return E_NOTIMPL;
+ if (mode->Size != sizeof(*mode))
+ return D3DERR_INVALIDCALL;
+
+ wined3d_mutex_lock();
+ hr = wined3d_get_adapter_display_mode(d3d9->wined3d, adapter, &wined3d_mode,
+ (enum wined3d_display_rotation *)rotation);
+ wined3d_mutex_unlock();
+
+ if (SUCCEEDED(hr))
+ {
+ mode->Width = wined3d_mode.width;
+ mode->Height = wined3d_mode.height;
+ mode->RefreshRate = wined3d_mode.refresh_rate;
+ mode->Format = d3dformat_from_wined3dformat(wined3d_mode.format_id);
+ mode->ScanLineOrdering = wined3d_mode.scanline_ordering;
+ }
+
+ return hr;
}
-static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9ExImpl_CreateDeviceEx(IDirect3D9Ex *iface,
+static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDeviceEx(IDirect3D9Ex *iface,
UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags,
D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode, IDirect3DDevice9Ex **device)
{
- IDirect3D9Impl *d3d9 = impl_from_IDirect3D9Ex(iface);
- IDirect3DDevice9Impl *object;
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
+ struct d3d9_device *object;
HRESULT hr;
TRACE("iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x, parameters %p, mode %p, device %p.\n",
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
if (!object)
- {
- ERR("Failed to allocate device memory.\n");
return E_OUTOFMEMORY;
- }
- hr = device_init(object, d3d9->WineD3D, adapter, device_type, focus_window, flags, parameters, mode);
+ hr = device_init(object, d3d9, d3d9->wined3d, adapter, device_type, focus_window, flags, parameters, mode);
if (FAILED(hr))
{
WARN("Failed to initialize device, hr %#x.\n", hr);
return D3D_OK;
}
-static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUID *luid)
+static HRESULT WINAPI d3d9_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUID *luid)
{
- IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
- WINED3DADAPTER_IDENTIFIER adapter_id;
+ struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface);
+ struct wined3d_adapter_identifier adapter_id;
HRESULT hr;
TRACE("iface %p, adapter %u, luid %p.\n", iface, adapter, luid);
adapter_id.device_name_size = 0;
wined3d_mutex_lock();
- hr = wined3d_get_adapter_identifier(This->WineD3D, adapter, 0, &adapter_id);
+ hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, 0, &adapter_id);
wined3d_mutex_unlock();
memcpy(luid, &adapter_id.adapter_luid, sizeof(*luid));
return hr;
}
-
-const IDirect3D9ExVtbl Direct3D9_Vtbl =
+static const struct IDirect3D9ExVtbl d3d9_vtbl =
{
/* IUnknown */
- IDirect3D9Impl_QueryInterface,
- IDirect3D9Impl_AddRef,
- IDirect3D9Impl_Release,
+ d3d9_QueryInterface,
+ d3d9_AddRef,
+ d3d9_Release,
/* IDirect3D9 */
- IDirect3D9Impl_RegisterSoftwareDevice,
- IDirect3D9Impl_GetAdapterCount,
- IDirect3D9Impl_GetAdapterIdentifier,
- IDirect3D9Impl_GetAdapterModeCount,
- IDirect3D9Impl_EnumAdapterModes,
- IDirect3D9Impl_GetAdapterDisplayMode,
- IDirect3D9Impl_CheckDeviceType,
- IDirect3D9Impl_CheckDeviceFormat,
- IDirect3D9Impl_CheckDeviceMultiSampleType,
- IDirect3D9Impl_CheckDepthStencilMatch,
- IDirect3D9Impl_CheckDeviceFormatConversion,
- IDirect3D9Impl_GetDeviceCaps,
- IDirect3D9Impl_GetAdapterMonitor,
- IDirect3D9Impl_CreateDevice,
+ d3d9_RegisterSoftwareDevice,
+ d3d9_GetAdapterCount,
+ d3d9_GetAdapterIdentifier,
+ d3d9_GetAdapterModeCount,
+ d3d9_EnumAdapterModes,
+ d3d9_GetAdapterDisplayMode,
+ d3d9_CheckDeviceType,
+ d3d9_CheckDeviceFormat,
+ d3d9_CheckDeviceMultiSampleType,
+ d3d9_CheckDepthStencilMatch,
+ d3d9_CheckDeviceFormatConversion,
+ d3d9_GetDeviceCaps,
+ d3d9_GetAdapterMonitor,
+ d3d9_CreateDevice,
/* IDirect3D9Ex */
- IDirect3D9ExImpl_GetAdapterModeCountEx,
- IDirect3D9ExImpl_EnumAdapterModesEx,
- IDirect3D9ExImpl_GetAdapterDisplayModeEx,
- IDirect3D9ExImpl_CreateDeviceEx,
- IDirect3D9ExImpl_GetAdapterLUID
-
+ d3d9_GetAdapterModeCountEx,
+ d3d9_EnumAdapterModesEx,
+ d3d9_GetAdapterDisplayModeEx,
+ d3d9_CreateDeviceEx,
+ d3d9_GetAdapterLUID,
};
+
+BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended)
+{
+ DWORD flags = WINED3D_PRESENT_CONVERSION | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER
+ | WINED3D_SRGB_READ_WRITE_CONTROL | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR
+ | WINED3D_NO_PRIMITIVE_RESTART | WINED3D_LEGACY_CUBEMAP_FILTERING | WINED3D_LIMIT_VIEWPORT;
+
+ if (!extended)
+ flags |= WINED3D_VIDMEM_ACCOUNTING;
+ else
+ flags |= WINED3D_RESTORE_MODE_ON_ACTIVATE;
+
+ d3d9->IDirect3D9Ex_iface.lpVtbl = &d3d9_vtbl;
+ d3d9->refcount = 1;
+
+ wined3d_mutex_lock();
+ d3d9->wined3d = wined3d_create(flags);
+ wined3d_mutex_unlock();
+ if (!d3d9->wined3d)
+ return FALSE;
+ d3d9->extended = extended;
+
+ return TRUE;
+}
projects / reactos.git / blobdiff