Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_set_compatible_renderbuffer ().
Alexandre Julliard
julliard at winehq.org
Thu Jun 13 15:40:39 CDT 2019
Module: wine
Branch: master
Commit: f3ee4d40ce79cfedba849b04827e864bf638c0e8
URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3ee4d40ce79cfedba849b04827e864bf638c0e8
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Jun 13 16:28:35 2019 +0430
wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_set_compatible_renderbuffer().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/context.c | 2 +-
dlls/wined3d/texture.c | 4 ++--
dlls/wined3d/wined3d_private.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 76b5858..a56576d 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -613,7 +613,7 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex
else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D)
{
wined3d_texture_gl_set_compatible_renderbuffer(wined3d_texture_gl(ds_texture),
- &context_gl->c, ds_level, &render_targets[0]);
+ context_gl, ds_level, &render_targets[0]);
}
}
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index d3c58cb..3f6d620 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -1452,9 +1452,9 @@ HRESULT CDECL wined3d_texture_set_color_key(struct wined3d_texture *texture,
/* TODO: We should synchronize the renderbuffer's content with the texture's content. */
/* Context activation is done by the caller. */
void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl,
- struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt)
+ struct wined3d_context_gl *context_gl, unsigned int level, const struct wined3d_rendertarget_info *rt)
{
- const struct wined3d_gl_info *gl_info = context->gl_info;
+ const struct wined3d_gl_info *gl_info = context_gl->c.gl_info;
struct wined3d_renderbuffer_entry *entry;
unsigned int src_width, src_height;
unsigned int width, height;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 91570ed..ece1aca 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3626,7 +3626,7 @@ void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl,
void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl,
struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN;
void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl,
- struct wined3d_context *context, unsigned int level,
+ struct wined3d_context_gl *context_gl, unsigned int level,
const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN;
#define WINED3D_LOCATION_DISCARDED 0x00000001
More information about the wine-cvs
mailing list