Henri Verbeet : wined3d: Remove the unused blit_op parameter to arbfp_blit_surface().
Alexandre Julliard
julliard at winehq.org
Thu Aug 4 12:22:09 CDT 2011
Module: wine
Branch: master
Commit: e74d1358ac0034ee5c09f6ab7e1d03f3511d266c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e74d1358ac0034ee5c09f6ab7e1d03f3511d266c
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Aug 3 21:34:44 2011 +0200
wined3d: Remove the unused blit_op parameter to arbfp_blit_surface().
---
dlls/wined3d/arb_program_shader.c | 7 ++++---
dlls/wined3d/surface.c | 5 +----
dlls/wined3d/wined3d_private.h | 6 +++---
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 077007a..d4a850b 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -7208,8 +7208,9 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum win
}
}
-HRESULT arbfp_blit_surface(struct wined3d_device *device, struct wined3d_surface *src_surface, const RECT *src_rect,
- struct wined3d_surface *dst_surface, const RECT *dst_rect_in, enum wined3d_blit_op blit_op, DWORD Filter)
+HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter,
+ struct wined3d_surface *src_surface, const RECT *src_rect,
+ struct wined3d_surface *dst_surface, const RECT *dst_rect_in)
{
struct wined3d_context *context;
RECT dst_rect = *dst_rect_in;
@@ -7229,7 +7230,7 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, struct wined3d_surface
ENTER_GL();
/* Draw a textured quad */
- draw_textured_quad(src_surface, src_rect, &dst_rect, Filter);
+ draw_textured_quad(src_surface, src_rect, &dst_rect, filter);
LEAVE_GL();
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 1c0425a..9336a00 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -5500,10 +5500,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa
src_surface->resource.format,
dst_rect, dst_surface->resource.usage, dst_surface->resource.pool,
dst_surface->resource.format))
- {
- return arbfp_blit_surface(device, src_surface, src_rect, dst_surface, dst_rect,
- WINED3D_BLIT_OP_COLOR_BLIT, Filter);
- }
+ return arbfp_blit_surface(device, Filter, src_surface, src_rect, dst_surface, dst_rect);
if (!device->blitter->blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT,
src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format,
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 0c53d22..1702046 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1218,9 +1218,9 @@ const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *g
DECLSPEC_HIDDEN;
/* Temporary blit_shader helper functions */
-HRESULT arbfp_blit_surface(struct wined3d_device *device, struct wined3d_surface *src_surface,
- const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect_in,
- enum wined3d_blit_op blit_op, DWORD Filter) DECLSPEC_HIDDEN;
+HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter,
+ struct wined3d_surface *src_surface, const RECT *src_rect,
+ struct wined3d_surface *dst_surface, const RECT *dst_rect) DECLSPEC_HIDDEN;
struct wined3d_context *context_acquire(struct wined3d_device *device, struct wined3d_surface *target) DECLSPEC_HIDDEN;
void context_alloc_event_query(struct wined3d_context *context,
More information about the wine-cvs
mailing list