Module: wine Branch: master Commit: a6862f917031357a61902a49548049be9481d13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6862f917031357a61902a4954...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Sun Mar 26 20:56:02 2017 +0200
wined3d: Rename struct blit_shader to struct wined3d_blitter_ops.
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/surface.c | 10 +++++----- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 16 +++++++--------- 6 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ca1d294..90e0a66 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7885,7 +7885,7 @@ static HRESULT arbfp_blit_depth_fill(struct wined3d_device *device, struct wined return WINED3DERR_INVALIDCALL; }
-const struct blit_shader arbfp_blit = +const struct wined3d_blitter_ops arbfp_blit = { arbfp_blit_alloc, arbfp_blit_free, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e8b0515..b058d45 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4158,7 +4158,7 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi struct wined3d_rendertarget_view *view, const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - const struct blit_shader *blitter; + const struct wined3d_blitter_ops *blitter; struct wined3d_resource *resource; enum wined3d_blit_op blit_op; RECT r; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9a67794..da6ff59 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2597,7 +2597,7 @@ static const struct wined3d_shader_backend_ops *select_shader_backend(const stru return &none_shader_backend; }
-static const struct blit_shader *select_blit_implementation(const struct wined3d_gl_info *gl_info, +static const struct wined3d_blitter_ops *select_blit_implementation(const struct wined3d_gl_info *gl_info, const struct wined3d_shader_backend_ops *shader_backend_ops) { if ((shader_backend_ops == &glsl_shader_backend diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 51fdcbb..135e02d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -547,9 +547,9 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const { struct wined3d_resource *resource = &surface->container->resource; struct wined3d_device *device = resource->device; + const struct wined3d_blitter_ops *blitter; struct wined3d_rendertarget_view *view; struct wined3d_view_desc view_desc; - const struct blit_shader *blitter; HRESULT hr;
if (!(blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, @@ -2105,9 +2105,9 @@ HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const st { struct wined3d_resource *resource = &s->container->resource; struct wined3d_device *device = resource->device; + const struct wined3d_blitter_ops *blitter; struct wined3d_rendertarget_view *view; struct wined3d_view_desc view_desc; - const struct blit_shader *blitter; HRESULT hr;
if (!(blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, @@ -2793,7 +2793,7 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl (old_color_key_flags & WINED3D_CKEY_SRC_BLT) ? &old_blt_key : NULL); }
-const struct blit_shader ffp_blit = +const struct wined3d_blitter_ops ffp_blit = { ffp_blit_alloc, ffp_blit_free, @@ -3434,7 +3434,7 @@ static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl ERR("Blit method not implemented by cpu_blit.\n"); }
-const struct blit_shader cpu_blit = +const struct wined3d_blitter_ops cpu_blit = { cpu_blit_alloc, cpu_blit_free, @@ -3592,7 +3592,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst else { struct wined3d_texture_sub_resource *src_sub_resource, *dst_sub_resource; - const struct blit_shader *blitter; + const struct wined3d_blitter_ops *blitter;
dst_sub_resource = surface_get_sub_resource(dst_surface); src_sub_resource = src_texture ? &src_texture->sub_resources[src_sub_resource_idx] : NULL; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e78763f..1627752 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5851,12 +5851,12 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb return memcmp(ka, kb, sizeof(*ka)); }
-const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, +const struct wined3d_blitter_ops *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { - static const struct blit_shader * const blitters[] = + static const struct wined3d_blitter_ops * const blitters[] = { &arbfp_blit, &ffp_blit, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7c9b061..3f4696e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1862,9 +1862,7 @@ enum wined3d_blit_op WINED3D_BLIT_OP_DEPTH_BLIT, };
-/* Shaders for color conversions in blits. Do not do blit operations while - * already under the GL lock. */ -struct blit_shader +struct wined3d_blitter_ops { HRESULT (*alloc_private)(struct wined3d_device *device); void (*free_private)(struct wined3d_device *device); @@ -1882,12 +1880,12 @@ struct blit_shader const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter); };
-extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN; -extern const struct blit_shader arbfp_blit DECLSPEC_HIDDEN; -extern const struct blit_shader cpu_blit DECLSPEC_HIDDEN; +extern const struct wined3d_blitter_ops arbfp_blit DECLSPEC_HIDDEN; +extern const struct wined3d_blitter_ops ffp_blit DECLSPEC_HIDDEN; +extern const struct wined3d_blitter_ops cpu_blit DECLSPEC_HIDDEN;
BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; -const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, +const struct wined3d_blitter_ops *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) @@ -2358,7 +2356,7 @@ struct wined3d_adapter const struct wined3d_vertex_pipe_ops *vertex_pipe; const struct fragment_pipeline *fragment_pipe; const struct wined3d_shader_backend_ops *shader_backend; - const struct blit_shader *blitter; + const struct wined3d_blitter_ops *blitter; };
struct wined3d_caps_gl_ctx @@ -2625,7 +2623,7 @@ struct wined3d_device struct StateEntry StateTable[STATE_HIGHEST + 1]; /* Array of functions for states which are handled by more than one pipeline part */ APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1]; - const struct blit_shader *blitter; + const struct wined3d_blitter_ops *blitter;
BYTE vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */ BYTE bCursorVisible : 1;