Commit 87c28704 authored by Steve Lhomme's avatar Steve Lhomme

d3d11_fmt: rename wdmm_version to wddm_version

parent 6a796df0
......@@ -531,7 +531,7 @@ static bool CanUseIntelHEVC(vlc_va_t *va)
{
vlc_va_sys_t *sys = va->sys;
/* it should be OK starting after driver 20.19.15.4835 */
struct wdmm_version WDMM = {
struct wddm_version WDMM = {
.wddm = 20,
.d3d_features = 19,
.revision = 15,
......
......@@ -305,7 +305,7 @@ static HKEY GetAdapterRegistry(DXGI_ADAPTER_DESC *adapterDesc)
}
#endif
int D3D11CheckDriverVersion(ID3D11Device *d3ddev, UINT vendorId, const struct wdmm_version *min_ver)
int D3D11CheckDriverVersion(ID3D11Device *d3ddev, UINT vendorId, const struct wddm_version *min_ver)
{
IDXGIAdapter *pAdapter = D3D11DeviceAdapter(d3ddev);
if (!pAdapter)
......
......@@ -29,6 +29,12 @@
DEFINE_GUID(GUID_CONTEXT_MUTEX, 0x472e8835, 0x3f8e, 0x4f93, 0xa0, 0xcb, 0x25, 0x79, 0x77, 0x6c, 0xed, 0x86);
/* see https://msdn.microsoft.com/windows/hardware/commercialize/design/compatibility/device-graphics */
struct wddm_version
{
int wddm, d3d_features, revision, build;
};
typedef struct
{
ID3D11Device *d3ddevice; /* D3D device */
......@@ -97,17 +103,11 @@ int D3D11_Create(vlc_object_t *, d3d11_handle_t *);
void D3D11_Destroy(d3d11_handle_t *);
/* see https://msdn.microsoft.com/windows/hardware/commercialize/design/compatibility/device-graphics */
struct wdmm_version
{
int wddm, d3d_features, revision, build;
};
bool isXboxHardware(ID3D11Device *d3ddev);
bool isNvidiaHardware(ID3D11Device *d3ddev);
IDXGIAdapter *D3D11DeviceAdapter(ID3D11Device *d3ddev);
int D3D11CheckDriverVersion(ID3D11Device *d3ddev, UINT vendorId,
const struct wdmm_version *min_ver);
const struct wddm_version *min_ver);
static inline bool DeviceSupportsFormat(ID3D11Device *d3ddevice,
DXGI_FORMAT format, UINT supportFlags)
......
......@@ -1973,7 +1973,7 @@ static bool CanUseTextureArray(vout_display_t *vd)
(void) vd;
return false;
#else
struct wdmm_version WDDM = {
struct wddm_version WDDM = {
.wddm = 22,
.d3d_features = 19,
.revision = 162,
......
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