Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to atifs_free_ffpshader().
Alexandre Julliard
julliard at winehq.org
Thu Aug 1 17:16:46 CDT 2019
Module: wine
Branch: master
Commit: c65f21be99fd037f2d6698d0c9754bde5a139e10
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c65f21be99fd037f2d6698d0c9754bde5a139e10
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Aug 1 01:06:03 2019 +0430
wined3d: Pass a wined3d_context_gl structure to atifs_free_ffpshader().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/ati_fragment_shader.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c
index e166d99..1945344 100644
--- a/dlls/wined3d/ati_fragment_shader.c
+++ b/dlls/wined3d/ati_fragment_shader.c
@@ -1333,10 +1333,10 @@ static void *atifs_alloc(const struct wined3d_shader_backend_ops *shader_backend
static void atifs_free_ffpshader(struct wine_rb_entry *entry, void *param)
{
struct atifs_ffp_desc *entry_ati = WINE_RB_ENTRY_VALUE(entry, struct atifs_ffp_desc, parent.entry);
- struct wined3d_context *context = param;
+ struct wined3d_context_gl *context_gl = param;
const struct wined3d_gl_info *gl_info;
- gl_info = context->gl_info;
+ gl_info = context_gl->c.gl_info;
GL_EXTCALL(glDeleteFragmentShaderATI(entry_ati->shader));
checkGLcall("glDeleteFragmentShaderATI(entry->shader)");
heap_free(entry_ati);
@@ -1345,9 +1345,10 @@ static void atifs_free_ffpshader(struct wine_rb_entry *entry, void *param)
/* Context activation is done by the caller. */
static void atifs_free(struct wined3d_device *device, struct wined3d_context *context)
{
+ struct wined3d_context_gl *context_gl = wined3d_context_gl(context);
struct atifs_private_data *priv = device->fragment_priv;
- wine_rb_destroy(&priv->fragment_shaders, atifs_free_ffpshader, context);
+ wine_rb_destroy(&priv->fragment_shaders, atifs_free_ffpshader, context_gl);
heap_free(priv);
device->fragment_priv = NULL;
More information about the wine-cvs
mailing list