From: Zebediah Figura zfigura@codeweavers.com
--- dlls/wined3d/wined3d_gl.h | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 28 +--------------------------- 2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index f4130c72d30..390e3164ea5 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -410,4 +410,30 @@ static inline bool wined3d_fence_supported(const struct wined3d_gl_info *gl_info #define checkGLcall(A) do {} while(0) #endif
+struct wined3d_bo_gl +{ + struct wined3d_bo b; + + GLuint id; + + struct wined3d_allocator_block *memory; + + GLsizeiptr size; + GLenum binding; + GLenum usage; + + GLbitfield flags; + uint64_t command_fence_id; +}; + +static inline struct wined3d_bo_gl *wined3d_bo_gl(struct wined3d_bo *bo) +{ + return CONTAINING_RECORD(bo, struct wined3d_bo_gl, b); +} + +static inline GLuint wined3d_bo_gl_id(struct wined3d_bo *bo) +{ + return bo ? wined3d_bo_gl(bo)->id : 0; +} + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c2c8f4035bd..acec4044f01 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -144,8 +144,6 @@ enum wined3d_ffp_emit_idx WINED3D_FFP_EMIT_COUNT, };
-#include "wined3d_gl.h" - /* Texture format fixups */
enum fixup_channel_source @@ -1613,31 +1611,7 @@ struct wined3d_bo bool coherent; };
-struct wined3d_bo_gl -{ - struct wined3d_bo b; - - GLuint id; - - struct wined3d_allocator_block *memory; - - GLsizeiptr size; - GLenum binding; - GLenum usage; - - GLbitfield flags; - uint64_t command_fence_id; -}; - -static inline struct wined3d_bo_gl *wined3d_bo_gl(struct wined3d_bo *bo) -{ - return CONTAINING_RECORD(bo, struct wined3d_bo_gl, b); -} - -static inline GLuint wined3d_bo_gl_id(struct wined3d_bo *bo) -{ - return bo ? wined3d_bo_gl(bo)->id : 0; -} +#include "wined3d_gl.h"
struct wined3d_bo_user {