From a64271c07efeecd4ed9db56c3bbfe3ddfac7f608 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Sun, 6 Nov 2011 22:05:59 +0100 Subject: [PATCH] wined3d: Make the surface parameter to blit_shader.set_shader() const. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4fabeeab40c..a4f2e687254 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7121,7 +7121,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ } /* Context activation is done by the caller. */ -static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface) +static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { GLenum shader; float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f}; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d70e22d2a9c..8def5b57b02 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6260,7 +6260,7 @@ static void ffp_blit_p8_upload_palette(const struct wined3d_surface *surface, co } /* Context activation is done by the caller. */ -static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface) +static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { enum complex_fixup fixup = get_complex_fixup(surface->resource.format->color_fixup); @@ -6409,7 +6409,7 @@ static void cpu_blit_free(struct wined3d_device *device) } /* Context activation is done by the caller. */ -static HRESULT cpu_blit_set(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface) +static HRESULT cpu_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b560f5c968..b4bc30df8a3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1201,7 +1201,7 @@ struct blit_shader { HRESULT (*alloc_private)(struct wined3d_device *device); void (*free_private)(struct wined3d_device *device); - HRESULT (*set_shader)(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface); + HRESULT (*set_shader)(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface); void (*unset_shader)(const struct wined3d_gl_info *gl_info); BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, WINED3DPOOL src_pool, const struct wined3d_format *src_format, -- 2.11.4.GIT