Commit 6dd231f7 authored by Steve Lhomme's avatar Steve Lhomme

d3d11_fmt: keep the modified build number once and for all

parent 79c56aad
...@@ -204,6 +204,11 @@ void D3D11_GetDriverVersion(vlc_object_t *obj, d3d11_device_t *d3d_dev) ...@@ -204,6 +204,11 @@ void D3D11_GetDriverVersion(vlc_object_t *obj, d3d11_device_t *d3d_dev)
d3d_dev->WDDM.revision = revision; d3d_dev->WDDM.revision = revision;
d3d_dev->WDDM.build = build; d3d_dev->WDDM.build = build;
msg_Dbg(obj, "%s WDDM driver %d.%d.%d.%d", DxgiVendorStr(adapterDesc.VendorId), wddm, d3d_features, revision, build); msg_Dbg(obj, "%s WDDM driver %d.%d.%d.%d", DxgiVendorStr(adapterDesc.VendorId), wddm, d3d_features, revision, build);
if (adapterDesc.VendorId == GPU_MANUFACTURER_INTEL && revision >= 100)
{
/* new Intel driver format */
d3d_dev->WDDM.build += (revision - 100) * 1000;
}
#endif #endif
} }
...@@ -373,13 +378,6 @@ int D3D11CheckDriverVersion(d3d11_device_t *d3d_dev, UINT vendorId, const struct ...@@ -373,13 +378,6 @@ int D3D11CheckDriverVersion(d3d11_device_t *d3d_dev, UINT vendorId, const struct
if (vendorId && adapterDesc.VendorId != vendorId) if (vendorId && adapterDesc.VendorId != vendorId)
return VLC_SUCCESS; return VLC_SUCCESS;
int build = d3d_dev->WDDM.build;
if (adapterDesc.VendorId == GPU_MANUFACTURER_INTEL && d3d_dev->WDDM.revision >= 100)
{
/* new Intel driver format */
build += (d3d_dev->WDDM.revision - 100) * 1000;
}
if (min_ver->wddm) if (min_ver->wddm)
{ {
if (d3d_dev->WDDM.wddm > min_ver->wddm) if (d3d_dev->WDDM.wddm > min_ver->wddm)
...@@ -403,9 +401,9 @@ int D3D11CheckDriverVersion(d3d11_device_t *d3d_dev, UINT vendorId, const struct ...@@ -403,9 +401,9 @@ int D3D11CheckDriverVersion(d3d11_device_t *d3d_dev, UINT vendorId, const struct
} }
if (min_ver->build) if (min_ver->build)
{ {
if (build > min_ver->build) if (d3d_dev->WDDM.build > min_ver->build)
return VLC_SUCCESS; return VLC_SUCCESS;
else if (build != min_ver->build) else if (d3d_dev->WDDM.build != min_ver->build)
return VLC_EGENERIC; return VLC_EGENERIC;
} }
return VLC_SUCCESS; return VLC_SUCCESS;
......
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