wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Henri Verbeet : wined3d: Store a wined3d_context_gl structure in struct glsl_ffp_destroy_ctx.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: 6a89bb057b5a75b5ba0f9c6f7246a5cca2d77831 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a89bb057b5a75b5ba0f9c6f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 1 01:06:04 2019 +0430 wined3d: Store a wined3d_context_gl structure in struct glsl_ffp_destroy_ctx. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d500329..828638b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -352,7 +352,7 @@ struct glsl_ffp_fragment_shader struct glsl_ffp_destroy_ctx { struct shader_glsl_priv *priv; - const struct wined3d_context *context; + const struct wined3d_context_gl *context_gl; }; static void shader_glsl_generate_shader_epilogue(const struct wined3d_shader_context *ctx); @@ -11452,8 +11452,9 @@ static void shader_glsl_free_ffp_vertex_shader(struct wine_rb_entry *entry, void struct glsl_ffp_vertex_shader, desc.entry); struct glsl_shader_prog_link *program, *program2; struct glsl_ffp_destroy_ctx *ctx = param; - const struct wined3d_gl_info *gl_info = ctx->context->gl_info; + const struct wined3d_gl_info *gl_info; + gl_info = ctx->context_gl->c.gl_info; LIST_FOR_EACH_ENTRY_SAFE(program, program2, &shader->linked_programs, struct glsl_shader_prog_link, vs.shader_entry) { @@ -11466,11 +11467,12 @@ static void shader_glsl_free_ffp_vertex_shader(struct wine_rb_entry *entry, void /* Context activation is done by the caller. */ static void glsl_vertex_pipe_vp_free(struct wined3d_device *device, struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct shader_glsl_priv *priv = device->vertex_priv; struct glsl_ffp_destroy_ctx ctx; ctx.priv = priv; - ctx.context = context; + ctx.context_gl = context_gl; wine_rb_destroy(&priv->ffp_vertex_shaders, shader_glsl_free_ffp_vertex_shader, &ctx); } @@ -11962,8 +11964,9 @@ static void shader_glsl_free_ffp_fragment_shader(struct wine_rb_entry *entry, vo struct glsl_ffp_fragment_shader, entry.entry); struct glsl_shader_prog_link *program, *program2; struct glsl_ffp_destroy_ctx *ctx = param; - const struct wined3d_gl_info *gl_info = ctx->context->gl_info; + const struct wined3d_gl_info *gl_info; + gl_info = ctx->context_gl->c.gl_info; LIST_FOR_EACH_ENTRY_SAFE(program, program2, &shader->linked_programs, struct glsl_shader_prog_link, ps.shader_entry) { @@ -11976,11 +11979,12 @@ static void shader_glsl_free_ffp_fragment_shader(struct wine_rb_entry *entry, vo /* Context activation is done by the caller. */ static void glsl_fragment_pipe_free(struct wined3d_device *device, struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct shader_glsl_priv *priv = device->fragment_priv; struct glsl_ffp_destroy_ctx ctx; ctx.priv = priv; - ctx.context = context; + ctx.context_gl = context_gl; wine_rb_destroy(&priv->ffp_fragment_shaders, shader_glsl_free_ffp_fragment_shader, &ctx); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to atifs_free_ffpshader().
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: c65f21be99fd037f2d6698d0c9754bde5a139e10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c65f21be99fd037f2d6698d0… Author: Henri Verbeet <hverbeet(a)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(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to arbfp_free_blit_shader().
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: d627239cac081c8763971c2e2a9035c61f28ef26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d627239cac081c8763971c2e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 1 01:06:02 2019 +0430 wined3d: Pass a wined3d_context_gl structure to arbfp_free_blit_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f91ff87..d4de02f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6906,10 +6906,10 @@ static void arbfp_free_blit_shader(struct wine_rb_entry *entry, void *ctx) { struct arbfp_blit_desc *entry_arb = WINE_RB_ENTRY_VALUE(entry, struct arbfp_blit_desc, entry); const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; - context = ctx; - gl_info = context->gl_info; + context_gl = ctx; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glDeleteProgramsARB(1, &entry_arb->shader)); checkGLcall("glDeleteProgramsARB(1, &entry_arb->shader)"); @@ -6919,6 +6919,7 @@ static void arbfp_free_blit_shader(struct wine_rb_entry *entry, void *ctx) /* Context activation is done by the caller. */ static void arbfp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_arbfp_blitter *arbfp_blitter; struct wined3d_blitter *next; @@ -6928,7 +6929,7 @@ static void arbfp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3 arbfp_blitter = CONTAINING_RECORD(blitter, struct wined3d_arbfp_blitter, blitter); - wine_rb_destroy(&arbfp_blitter->shaders, arbfp_free_blit_shader, context); + wine_rb_destroy(&arbfp_blitter->shaders, arbfp_free_blit_shader, context_gl); checkGLcall("Delete blit programs"); if (arbfp_blitter->palette_texture)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2019