Module: wine Branch: master Commit: 6c1eb2cf4007705264d72524b4c383e018401d98 URL: https://gitlab.winehq.org/wine/wine/-/commit/6c1eb2cf4007705264d72524b4c383e...
Author: Zebediah Figura zfigura@codeweavers.com Date: Fri Jan 6 16:29:57 2023 -0600
wined3d: Move struct wined3d_swapchain_gl to wined3d_gl.h.
---
dlls/wined3d/wined3d_gl.h | 17 +++++++++++++++++ dlls/wined3d/wined3d_private.h | 20 +------------------- 2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index cb9810a3f1c..59512b7bcc6 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -32,6 +32,7 @@ #include "wine/wgl.h" #include "wine/wgl_driver.h"
+struct wined3d_swapchain_gl; struct wined3d_texture_gl;
#define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837 /* not in the gl spec */ @@ -1113,4 +1114,20 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi void wined3d_unordered_access_view_gl_update(struct wined3d_unordered_access_view_gl *uav_gl, struct wined3d_context_gl *context_gl);
+struct wined3d_swapchain_gl +{ + struct wined3d_swapchain s; +}; + +static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_swapchain *swapchain) +{ + return CONTAINING_RECORD(swapchain, struct wined3d_swapchain_gl, s); +} + +void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl); +struct wined3d_context_gl *wined3d_swapchain_gl_get_context(struct wined3d_swapchain_gl *swapchain_gl); +HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_device *device, + const struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, + void *parent, const struct wined3d_parent_ops *parent_ops); + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f79cc01974d..c8132783223 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -97,7 +97,6 @@ struct wined3d_adapter; struct wined3d_context; struct wined3d_gl_info; struct wined3d_state; -struct wined3d_swapchain_gl; struct wined3d_vertex_pipe_ops;
enum wined3d_ffp_idx @@ -4028,8 +4027,6 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_view *view, unsigned int value) DECLSPEC_HIDDEN;
-#include "wined3d_gl.h" - struct wined3d_swapchain_state { struct wined3d *wined3d; @@ -4095,22 +4092,7 @@ HRESULT wined3d_swapchain_no3d_init(struct wined3d_swapchain *swapchain_no3d, struct wined3d_swapchain_state_parent *state_parent, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;
-struct wined3d_swapchain_gl -{ - struct wined3d_swapchain s; -}; - -static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_swapchain *swapchain) -{ - return CONTAINING_RECORD(swapchain, struct wined3d_swapchain_gl, s); -} - -void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; -struct wined3d_context_gl *wined3d_swapchain_gl_get_context(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; -HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, - struct wined3d_device *device, const struct wined3d_swapchain_desc *desc, - struct wined3d_swapchain_state_parent *state_parent, void *parent, - const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +#include "wined3d_gl.h"
/***************************************************************************** * Utility function prototypes
-
Alexandre Julliard