Signed-off-by: Henri Verbeet hverbeet@codeweavers.com --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bdd291b74f5..3d1a48321f1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1743,7 +1743,7 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC }
/* Context activation is done by the caller. */ -void context_bind_dummy_textures(const struct wined3d_device *device, const struct wined3d_context *context) +void context_bind_dummy_textures(const struct wined3d_context *context) { const struct wined3d_dummy_textures *textures = &context->device->dummy_textures; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -2287,7 +2287,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, * are not created yet. In that case, they will be created (and bound) by * create_dummy_textures right after this context is initialized. */ if (device->dummy_textures.tex_2d) - context_bind_dummy_textures(device, context); + context_bind_dummy_textures(context);
/* Initialise all rectangles to avoid resetting unused ones later. */ gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b50d6677ab2..17ef5d90148 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -738,7 +738,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_
checkGLcall("create dummy textures");
- context_bind_dummy_textures(device, context); + context_bind_dummy_textures(context); }
/* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 33d248fcfdd..88dce65a15a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2156,8 +2156,7 @@ void context_apply_ffp_blit_state(struct wined3d_context *context, void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, unsigned int unit) DECLSPEC_HIDDEN; void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; -void context_bind_dummy_textures(const struct wined3d_device *device, - const struct wined3d_context *context) DECLSPEC_HIDDEN; +void context_bind_dummy_textures(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint name) DECLSPEC_HIDDEN; void context_check_fbo_status(const struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN; void context_copy_bo_address(struct wined3d_context *context,