Zhiyi Zhang : wined3d: Introduce wined3d_output_get_adapter().

Alexandre Julliard julliard at winehq.org
Mon Mar 9 17:42:36 CDT 2020


Module: wine
Branch: master
Commit: 744ff73829e037e2fa64d7a5c0881f33424563bd
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=744ff73829e037e2fa64d7a5c0881f33424563bd

Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date:   Mon Mar  9 15:41:17 2020 +0800

wined3d: Introduce wined3d_output_get_adapter().

Signed-off-by: Zhiyi Zhang <zzhang 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    | 7 +++++++
 dlls/wined3d/wined3d.spec | 3 ++-
 include/wine/wined3d.h    | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 8053f9dc53..7419425d71 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1179,6 +1179,13 @@ HRESULT CDECL wined3d_output_find_closest_matching_mode(const struct wined3d_out
     return WINED3D_OK;
 }
 
+struct wined3d_adapter * CDECL wined3d_output_get_adapter(const struct wined3d_output *output)
+{
+    TRACE("output %p.\n", output);
+
+    return output->adapter;
+}
+
 HRESULT CDECL wined3d_output_get_display_mode(const struct wined3d_output *output,
         struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation)
 {
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index d8ffdee9ac..472cd907b3 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -157,12 +157,13 @@
 @ cdecl wined3d_device_validate_device(ptr ptr)
 
 @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr)
+@ cdecl wined3d_output_get_adapter(ptr)
 @ cdecl wined3d_output_get_display_mode(ptr ptr ptr)
 @ cdecl wined3d_output_get_mode(ptr long long long ptr)
 @ cdecl wined3d_output_get_mode_count(ptr long long)
 @ cdecl wined3d_output_get_raster_status(ptr ptr)
-@ cdecl wined3d_output_set_display_mode(ptr ptr)
 @ cdecl wined3d_output_release_ownership(ptr)
+@ cdecl wined3d_output_set_display_mode(ptr ptr)
 @ cdecl wined3d_output_take_ownership(ptr long)
 
 @ cdecl wined3d_palette_create(ptr long long ptr ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 3e05852640..09c6995de0 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2497,6 +2497,7 @@ HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *devi
 
 HRESULT __cdecl wined3d_output_find_closest_matching_mode(const struct wined3d_output *output,
         struct wined3d_display_mode *mode);
+struct wined3d_adapter * __cdecl wined3d_output_get_adapter(const struct wined3d_output *output);
 HRESULT __cdecl wined3d_output_get_display_mode(const struct wined3d_output *output,
         struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation);
 HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output,




More information about the wine-cvs mailing list