From 3581fb19f69de77a422a7b6d45b354c03285e7bc Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 6 Jan 2023 16:33:02 -0600 Subject: [PATCH] wined3d: Move the remaining wined3d_gl_info functions to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 4 ++++ dlls/wined3d/wined3d_private.h | 10 ++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 59512b7bcc6..9d1827cd608 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -364,7 +364,11 @@ struct wined3d_gl_info void install_gl_compat_wrapper(struct wined3d_gl_info *gl_info, enum wined3d_gl_extension ext); void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id, BOOL program); +void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, + BOOL is_alpha, int stage, enum wined3d_texture_op op, uint32_t arg1, uint32_t arg2, uint32_t arg3, + int texture_idx, DWORD dst); void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLuint program); +void texture_activate_dimensions(struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info); GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags); void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, const char *file, unsigned int line, const char *name); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c8132783223..3198c36c37d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -95,7 +95,6 @@ static inline const char *wined3d_get_line(const char **ptr, const char *end) struct wined3d_fragment_pipe_ops; struct wined3d_adapter; struct wined3d_context; -struct wined3d_gl_info; struct wined3d_state; struct wined3d_vertex_pipe_ops; @@ -4092,8 +4091,6 @@ 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; -#include "wined3d_gl.h" - /***************************************************************************** * Utility function prototypes */ @@ -4128,11 +4125,6 @@ void dump_color_fixup_desc(struct color_fixup_desc fixup) DECLSPEC_HIDDEN; BOOL is_invalid_op(const struct wined3d_state *state, int stage, enum wined3d_texture_op op, DWORD arg1, DWORD arg2, DWORD arg3) DECLSPEC_HIDDEN; -void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, - BOOL is_alpha, int stage, enum wined3d_texture_op op, uint32_t arg1, uint32_t arg2, uint32_t arg3, - INT texture_idx, DWORD dst) DECLSPEC_HIDDEN; -void texture_activate_dimensions(struct wined3d_texture *texture, - const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void sampler_texdim(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void tex_alphaop(struct wined3d_context *context, @@ -4631,6 +4623,8 @@ uint32_t wined3d_format_pack(const struct wined3d_format *format, const struct w BOOL wined3d_formats_are_srgb_variants(enum wined3d_format_id format1, enum wined3d_format_id format2) DECLSPEC_HIDDEN; +#include "wined3d_gl.h" + struct wined3d_format_gl { struct wined3d_format f; -- 2.11.4.GIT