Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_destroy_fbo().

Alexandre Julliard julliard at winehq.org
Thu May 16 16:26:58 CDT 2019


Module: wine
Branch: master
Commit: 9729f15acc1a0c841596c02a5faa9d2a80901d4c
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=9729f15acc1a0c841596c02a5faa9d2a80901d4c

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu May 16 17:52:56 2019 +0430

wined3d: Pass a wined3d_context_gl structure to context_destroy_fbo().

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/context.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index e6d94f2..db3c4ee 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -99,10 +99,9 @@ static void context_clean_fbo_attachments(const struct wined3d_gl_info *gl_info,
 }
 
 /* Context activation is done by the caller. */
-static void context_destroy_fbo(struct wined3d_context *context, GLuint fbo)
+static void wined3d_context_gl_destroy_fbo(struct wined3d_context_gl *context_gl, GLuint fbo)
 {
-    struct wined3d_context_gl *context_gl = wined3d_context_gl(context);
-    const struct wined3d_gl_info *gl_info = context->gl_info;
+    const struct wined3d_gl_info *gl_info = context_gl->c.gl_info;
 
     wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, fbo);
     context_clean_fbo_attachments(gl_info, GL_FRAMEBUFFER);
@@ -568,7 +567,7 @@ static void context_destroy_fbo_entry(struct wined3d_context *context, struct fb
     if (entry->id)
     {
         TRACE("Destroy FBO %u.\n", entry->id);
-        context_destroy_fbo(context, entry->id);
+        wined3d_context_gl_destroy_fbo(wined3d_context_gl(context), entry->id);
     }
     --context->fbo_entry_count;
     list_remove(&entry->entry);




More information about the wine-cvs mailing list