Module: wine Branch: master Commit: 8618b09eef403c5c99169237f47f68dade553e55 URL: https://gitlab.winehq.org/wine/wine/-/commit/8618b09eef403c5c99169237f47f68d...
Author: Zebediah Figura zfigura@codeweavers.com Date: Fri Jan 6 16:26:55 2023 -0600
wined3d: Move struct fbo_entry to wined3d_gl.h.
---
dlls/wined3d/wined3d_gl.h | 24 ++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 4654be41bec..b21a38c2e95 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -574,6 +574,30 @@ struct wined3d_command_fence_gl
#define MAX_GL_FRAGMENT_SAMPLERS 32
+struct wined3d_fbo_resource +{ + GLuint object; + GLenum target; + GLuint level, layer; +}; + +#define WINED3D_FBO_ENTRY_FLAG_ATTACHED 0x1 +#define WINED3D_FBO_ENTRY_FLAG_DEPTH 0x2 +#define WINED3D_FBO_ENTRY_FLAG_STENCIL 0x4 + +struct fbo_entry +{ + struct list entry; + uint32_t flags; + uint32_t rt_mask; + GLuint id; + struct wined3d_fbo_entry_key + { + uint32_t rb_namespace; + struct wined3d_fbo_resource objects[WINED3D_MAX_RENDER_TARGETS + 1]; + } key; +}; + struct wined3d_context_gl { struct wined3d_context c; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f643de4561e..e167df6db17 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3517,30 +3517,6 @@ HRESULT wined3d_texture_no3d_init(struct wined3d_texture *texture_no3d, struct w
#include "wined3d_gl.h"
-struct wined3d_fbo_resource -{ - GLuint object; - GLenum target; - GLuint level, layer; -}; - -#define WINED3D_FBO_ENTRY_FLAG_ATTACHED 0x1 -#define WINED3D_FBO_ENTRY_FLAG_DEPTH 0x2 -#define WINED3D_FBO_ENTRY_FLAG_STENCIL 0x4 - -struct fbo_entry -{ - struct list entry; - uint32_t flags; - uint32_t rt_mask; - GLuint id; - struct wined3d_fbo_entry_key - { - DWORD rb_namespace; - struct wined3d_fbo_resource objects[WINED3D_MAX_RENDER_TARGETS + 1]; - } key; -}; - struct wined3d_sampler { struct wine_rb_entry entry;