Module: wine Branch: master Commit: 983bcd96397ffb8dc10f6b229f19d78df165672a URL: https://gitlab.winehq.org/wine/wine/-/commit/983bcd96397ffb8dc10f6b229f19d78...
Author: Eric Pouech eric.pouech@gmail.com Date: Thu Dec 8 10:46:48 2022 +0100
wined3d: Change stencil parameter type in blitter_clear() method.
Signed-off-by: Eric Pouech eric.pouech@gmail.com
---
dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a3005a3cfe0..113279e0bb6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7940,7 +7940,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl
static void arbfp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil) { struct wined3d_blitter *next;
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 188080967e5..594fdf73f46 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13272,7 +13272,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli
static void glsl_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, uint32_t flags, const struct wined3d_color *color, float depth, DWORD stencil) + const RECT *draw_rect, uint32_t flags, const struct wined3d_color *color, float depth, unsigned int stencil) { struct wined3d_blitter *next;
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8bee9b6d83b..fd8db9ce60d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1243,7 +1243,7 @@ static bool wined3d_box_intersect(struct wined3d_box *ret, const struct wined3d_
static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil) { struct wined3d_color c = {depth, 0.0f, 0.0f, 0.0f}; struct wined3d_box box, box_clip, box_view; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7fa3022635f..d770a82caab 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6068,7 +6068,7 @@ static bool blitter_use_cpu_clear(struct wined3d_rendertarget_view *view)
static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil) { struct wined3d_rendertarget_view *view, *previous = NULL; bool have_identical_size = TRUE; @@ -6345,7 +6345,7 @@ static void fbo_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_
static void fbo_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil) { struct wined3d_blitter *next;
@@ -6458,7 +6458,7 @@ static void raw_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_
static void raw_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil) { struct wined3d_blitter *next;
@@ -6826,7 +6826,7 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk
static void vk_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil) { struct wined3d_device_vk *device_vk = wined3d_device_vk(device); struct wined3d_rendertarget_view *view, *previous = NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 38dc994010d..e4104d2c61a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2909,7 +2909,7 @@ struct wined3d_blitter_ops void (*blitter_destroy)(struct wined3d_blitter *blitter, struct wined3d_context *context); void (*blitter_clear)(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, DWORD stencil); + const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil); DWORD (*blitter_blit)(struct wined3d_blitter *blitter, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, DWORD src_location, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx,