Module: wine Branch: master Commit: 7cc688371ff9b22ba0ed972836781fcf8c90cda3 URL: https://gitlab.winehq.org/wine/wine/-/commit/7cc688371ff9b22ba0ed972836781fc...
Author: Elizabeth Figura zfigura@codeweavers.com Date: Tue Apr 23 16:29:28 2024 -0500
wined3d: Move the GL_EXTCALL() definition to wined3d_gl.h.
---
dlls/wined3d/wined3d_gl.h | 2 ++ dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 060d92318f8..561de235379 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -358,6 +358,8 @@ struct wined3d_gl_info void (WINE_GLAPI *p_glEnableWINE)(GLenum cap); };
+#define GL_EXTCALL(f) (gl_info->gl_ops.ext.p_##f) + 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 shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLuint program); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ea45e5ebdb3..8b8d9457a38 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1553,8 +1553,6 @@ extern const struct wined3d_shader_backend_ops none_shader_backend;
const struct wined3d_shader_backend_ops *wined3d_spirv_shader_backend_init_vk(void);
-#define GL_EXTCALL(f) (gl_info->gl_ops.ext.p_##f) - #define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xff) #define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xff) #define D3DCOLOR_B_B(dw) (((dw) >> 0) & 0xff)