Module: wine Branch: master Commit: a26c5f9b1366696e5c27214a73d4d2b07534a715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26c5f9b1366696e5c27214a73...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Jul 7 21:01:39 2011 +0200
wined3d: Make the surface parameter to d3dfmt_get_conv() const.
---
dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f162764..ce669e1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4131,11 +4131,11 @@ static void flush_to_framebuffer_drawpixels(struct wined3d_surface *surface, context_release(context); }
-HRESULT d3dfmt_get_conv(struct wined3d_surface *surface, BOOL need_alpha_ck, +HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing, struct wined3d_format *format, CONVERT_TYPES *convert) { BOOL colorkey_active = need_alpha_ck && (surface->CKeyFlags & WINEDDSD_CKSRCBLT); - struct wined3d_device *device = surface->resource.device; + const struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; BOOL blit_supported = FALSE;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a0941b6..374c631 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2159,7 +2159,7 @@ typedef enum { CONVERT_RGB32_888 } CONVERT_TYPES;
-HRESULT d3dfmt_get_conv(struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing, +HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing, struct wined3d_format *format, CONVERT_TYPES *convert) DECLSPEC_HIDDEN; void d3dfmt_p8_init_palette(struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) DECLSPEC_HIDDEN;
-
Alexandre Julliard