mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 07:47:07 +00:00
wined3d: Move struct wined3d_bo_gl to wined3d_gl.h.
This commit is contained in:
parent
f1749b0808
commit
2ace2166a1
|
@ -410,4 +410,30 @@ static inline bool wined3d_fence_supported(const struct wined3d_gl_info *gl_info
|
||||||
#define checkGLcall(A) do {} while(0)
|
#define checkGLcall(A) do {} while(0)
|
||||||
#endif
|
#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 */
|
#endif /* __WINE_WINED3D_GL */
|
||||||
|
|
|
@ -144,8 +144,6 @@ enum wined3d_ffp_emit_idx
|
||||||
WINED3D_FFP_EMIT_COUNT,
|
WINED3D_FFP_EMIT_COUNT,
|
||||||
};
|
};
|
||||||
|
|
||||||
#include "wined3d_gl.h"
|
|
||||||
|
|
||||||
/* Texture format fixups */
|
/* Texture format fixups */
|
||||||
|
|
||||||
enum fixup_channel_source
|
enum fixup_channel_source
|
||||||
|
@ -1613,31 +1611,7 @@ struct wined3d_bo
|
||||||
bool coherent;
|
bool coherent;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wined3d_bo_gl
|
#include "wined3d_gl.h"
|
||||||
{
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct wined3d_bo_user
|
struct wined3d_bo_user
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue