=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Expose feature level in wined3d caps.
Alexandre Julliard
julliard at winehq.org
Fri Jun 15 15:40:59 CDT 2018
Module: wine
Branch: master
Commit: 98ef3c88606953ac9ddd84dfcefccbc43a5fdbb6
URL: https://source.winehq.org/git/wine.git/?a=commit;h=98ef3c88606953ac9ddd84dfcefccbc43a5fdbb6
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Wed Jun 13 12:24:02 2018 +0200
wined3d: Expose feature level in wined3d caps.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/directx.c | 2 ++
dlls/wined3d/wined3d_private.h | 13 -------------
include/wine/wined3d.h | 15 +++++++++++++++
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 7046060..9ecc4ed 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -6190,6 +6190,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
caps->shader_double_precision = d3d_info->shader_double_precision;
+ caps->max_feature_level = d3d_info->feature_level;
+
return WINED3D_OK;
}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 0188846..9aa7081 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -184,19 +184,6 @@ struct wined3d_ffp_attrib_ops
wined3d_generic_attrib_func generic[WINED3D_FFP_EMIT_COUNT];
};
-enum wined3d_feature_level
-{
- WINED3D_FEATURE_LEVEL_5,
- WINED3D_FEATURE_LEVEL_6,
- WINED3D_FEATURE_LEVEL_7,
- WINED3D_FEATURE_LEVEL_8,
- WINED3D_FEATURE_LEVEL_9_SM2,
- WINED3D_FEATURE_LEVEL_9_SM3,
- WINED3D_FEATURE_LEVEL_10,
- WINED3D_FEATURE_LEVEL_11,
- WINED3D_FEATURE_LEVEL_COUNT
-};
-
struct wined3d_d3d_info
{
struct wined3d_d3d_limits limits;
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 0f388ab..239ccd8 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -88,6 +88,19 @@ enum wined3d_device_type
WINED3D_DEVICE_TYPE_NULLREF = 4,
};
+enum wined3d_feature_level
+{
+ WINED3D_FEATURE_LEVEL_5,
+ WINED3D_FEATURE_LEVEL_6,
+ WINED3D_FEATURE_LEVEL_7,
+ WINED3D_FEATURE_LEVEL_8,
+ WINED3D_FEATURE_LEVEL_9_SM2,
+ WINED3D_FEATURE_LEVEL_9_SM3,
+ WINED3D_FEATURE_LEVEL_10,
+ WINED3D_FEATURE_LEVEL_11,
+ WINED3D_FEATURE_LEVEL_COUNT
+};
+
enum wined3d_degree_type
{
WINED3D_DEGREE_LINEAR = 1,
@@ -1962,6 +1975,8 @@ struct wined3d_caps
struct wined3d_ddraw_caps ddraw_caps;
BOOL shader_double_precision;
+
+ enum wined3d_feature_level max_feature_level;
};
struct wined3d_color_key
More information about the wine-cvs
mailing list