Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_sampler_desc_from_sampler_states ().
Alexandre Julliard
julliard at winehq.org
Fri Aug 2 14:26:29 CDT 2019
Module: wine
Branch: master
Commit: e246d9227f88f0946404f985ec099b13a7418134
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e246d9227f88f0946404f985ec099b13a7418134
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Aug 2 03:50:08 2019 +0430
wined3d: Pass a wined3d_context_gl structure to wined3d_sampler_desc_from_sampler_states().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/state.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index bf110bc..9b53bd1 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -3527,7 +3527,7 @@ static enum wined3d_texture_address wined3d_texture_gl_address_mode(const struct
}
static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc *desc,
- const struct wined3d_context *context, const DWORD *sampler_states,
+ const struct wined3d_context_gl *context_gl, const DWORD *sampler_states,
const struct wined3d_texture_gl *texture_gl)
{
union
@@ -3578,7 +3578,7 @@ static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc
if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2)
{
desc->mip_filter = WINED3D_TEXF_NONE;
- if (context->gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT])
+ if (context_gl->c.gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT])
desc->min_filter = WINED3D_TEXF_POINT;
}
}
@@ -3615,7 +3615,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state
struct wined3d_sampler *sampler;
struct wine_rb_entry *entry;
- wined3d_sampler_desc_from_sampler_states(&desc, context, sampler_states, texture_gl);
+ wined3d_sampler_desc_from_sampler_states(&desc, context_gl, sampler_states, texture_gl);
wined3d_texture_gl_bind(texture_gl, context_gl, srgb);
More information about the wine-cvs
mailing list