[vlc-devel] [PATCH 1/6] dxgi_fmt: move the manufacturer IDs in dxgi_fmt.h
Steve Lhomme
robux4 at videolabs.io
Fri Dec 1 09:55:10 CET 2017
---
modules/video_chroma/d3d11_fmt.h | 7 -------
modules/video_chroma/dxgi_fmt.h | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/modules/video_chroma/d3d11_fmt.h b/modules/video_chroma/d3d11_fmt.h
index 663cc99203..68d02b9fe5 100644
--- a/modules/video_chroma/d3d11_fmt.h
+++ b/modules/video_chroma/d3d11_fmt.h
@@ -97,13 +97,6 @@ int D3D11_Create(vlc_object_t *, d3d11_handle_t *);
void D3D11_Destroy(d3d11_handle_t *);
-#define GPU_MANUFACTURER_AMD 0x1002
-#define GPU_MANUFACTURER_NVIDIA 0x10DE
-#define GPU_MANUFACTURER_VIA 0x1106
-#define GPU_MANUFACTURER_INTEL 0x8086
-#define GPU_MANUFACTURER_S3 0x5333
-#define GPU_MANUFACTURER_QUALCOMM 0x4D4F4351
-
/* see https://msdn.microsoft.com/windows/hardware/commercialize/design/compatibility/device-graphics */
struct wdmm_version
{
diff --git a/modules/video_chroma/dxgi_fmt.h b/modules/video_chroma/dxgi_fmt.h
index 4961cd4a08..71dd65cdf2 100644
--- a/modules/video_chroma/dxgi_fmt.h
+++ b/modules/video_chroma/dxgi_fmt.h
@@ -29,6 +29,13 @@
#include <vlc_common.h>
#include <vlc_fourcc.h>
+#define GPU_MANUFACTURER_AMD 0x1002
+#define GPU_MANUFACTURER_NVIDIA 0x10DE
+#define GPU_MANUFACTURER_VIA 0x1106
+#define GPU_MANUFACTURER_INTEL 0x8086
+#define GPU_MANUFACTURER_S3 0x5333
+#define GPU_MANUFACTURER_QUALCOMM 0x4D4F4351
+
#define D3D11_MAX_SHADER_VIEW 3
typedef struct
--
2.14.2
More information about the vlc-devel
mailing list