[vlc-commits] d3d9_fmt: remove the driver version check function as it's not used anymore
Steve Lhomme
git at videolan.org
Thu Apr 19 10:33:47 CEST 2018
vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Apr 19 09:51:35 2018 +0200| [50424c36d290aea51300a44864cd61ee609b75e5] | committer: Hugo Beauzée-Luyssen
d3d9_fmt: remove the driver version check function as it's not used anymore
It may come back later.
(cherry picked from commit eea7cee18db7f7c32b2822767f8fca3604e9498a)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=50424c36d290aea51300a44864cd61ee609b75e5
---
modules/video_chroma/d3d9_fmt.c | 54 -----------------------------------------
modules/video_chroma/d3d9_fmt.h | 8 ------
2 files changed, 62 deletions(-)
diff --git a/modules/video_chroma/d3d9_fmt.c b/modules/video_chroma/d3d9_fmt.c
index 901317935f..6b67f0c2ac 100644
--- a/modules/video_chroma/d3d9_fmt.c
+++ b/modules/video_chroma/d3d9_fmt.c
@@ -255,57 +255,3 @@ error:
D3D9_Destroy( hd3d );
return VLC_EGENERIC;
}
-
-int D3D9CheckDriverVersion(d3d9_handle_t *hd3d, d3d9_device_t *d3d_dev,
- UINT vendorId, const struct wddm_version *min_ver)
-{
- D3DADAPTER_IDENTIFIER9 identifier;
- HRESULT hr = IDirect3D9_GetAdapterIdentifier(hd3d->obj, d3d_dev->adapterId, 0, &identifier);
- if (FAILED(hr))
- return VLC_EGENERIC;
-
- if (vendorId && identifier.VendorId != vendorId)
- return VLC_SUCCESS;
-
- int wddm, d3d_features, revision, build;
- wddm = (int) (identifier.DriverVersion.HighPart >> 16 & 0xFFFF);
- d3d_features = (int) (identifier.DriverVersion.HighPart >> 0 & 0xFFFF);
- revision = (int) (identifier.DriverVersion.LowPart >> 16 & 0xFFFF);
- build = (int) (identifier.DriverVersion.LowPart >> 0 & 0xFFFF);
-
- if (identifier.VendorId == GPU_MANUFACTURER_INTEL && revision >= 100)
- {
- /* new Intel driver format */
- build += (revision - 100) * 1000;
- }
-
- if (min_ver->wddm)
- {
- if (wddm > min_ver->wddm)
- return VLC_SUCCESS;
- else if (wddm != min_ver->wddm)
- return VLC_EGENERIC;
- }
- if (min_ver->d3d_features)
- {
- if (d3d_features > min_ver->d3d_features)
- return VLC_SUCCESS;
- else if (d3d_features != min_ver->d3d_features)
- return VLC_EGENERIC;
- }
- if (min_ver->revision)
- {
- if (revision > min_ver->revision)
- return VLC_SUCCESS;
- else if (revision != min_ver->revision)
- return VLC_EGENERIC;
- }
- if (min_ver->build)
- {
- if (build > min_ver->build)
- return VLC_SUCCESS;
- else if (build != min_ver->build)
- return VLC_EGENERIC;
- }
- return VLC_SUCCESS;
-}
diff --git a/modules/video_chroma/d3d9_fmt.h b/modules/video_chroma/d3d9_fmt.h
index c7242ad525..6f86f0f04e 100644
--- a/modules/video_chroma/d3d9_fmt.h
+++ b/modules/video_chroma/d3d9_fmt.h
@@ -99,12 +99,4 @@ void D3D9_Destroy(d3d9_handle_t *);
int D3D9_FillPresentationParameters(d3d9_handle_t *, const video_format_t *, d3d9_device_t *);
-struct wddm_version
-{
- int wddm, d3d_features, revision, build;
-};
-int D3D9CheckDriverVersion(d3d9_handle_t *hd3d, d3d9_device_t *d3d_dev, UINT vendorId,
- const struct wddm_version *min_ver);
-
-
#endif /* VLC_VIDEOCHROMA_D3D9_FMT_H_ */
More information about the vlc-commits
mailing list