ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Merge wined3d_blitter_ops.color_fill() and wined3d_blitter_ops.depth_fill().

Browse Source 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2017-04-03 07:39:45 +02:00 committed by Alexandre Julliard
parent 8c98be4791
commit 03e85bf991
4 changed files with 38 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/wined3d/arb_program_shader.c
View File

@ -7868,18 +7868,10 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_
context->gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ context->gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */
} }
static HRESULT arbfp_blit_color_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, static void arbfp_blit_clear(struct wined3d_device *device, struct wined3d_rendertarget_view *view,
const RECT *rect, const struct wined3d_color *color) const RECT *rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil)
{ {
FIXME("Color filling not implemented by arbfp_blit\n"); ERR("This blitter does not implement clears.\n");
return WINED3DERR_INVALIDCALL;
}
static HRESULT arbfp_blit_depth_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view,
const RECT *rect, DWORD clear_flags, float depth, DWORD stencil)
{
FIXME("Depth/stencil filling not implemented by arbfp_blit.\n");
return WINED3DERR_INVALIDCALL;
} }
const struct wined3d_blitter_ops arbfp_blit = const struct wined3d_blitter_ops arbfp_blit =
@ -7887,7 +7879,6 @@ const struct wined3d_blitter_ops arbfp_blit =
arbfp_blit_alloc, arbfp_blit_alloc,
arbfp_blit_free, arbfp_blit_free,
arbfp_blit_supported, arbfp_blit_supported,
arbfp_blit_color_fill, arbfp_blit_clear,
arbfp_blit_depth_fill,
arbfp_blit_surface, arbfp_blit_surface,
}; };

5
dlls/wined3d/device.c
View File

@ -4196,10 +4196,7 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
if (blit_op == WINED3D_BLIT_OP_COLOR_FILL) blitter->blitter_clear(device, view, rect, flags, color, depth, stencil);
blitter->color_fill(device, view, rect, color);
else
blitter->depth_fill(device, view, rect, flags, depth, stencil);
return WINED3D_OK; return WINED3D_OK;
} }

76
dlls/wined3d/surface.c
View File

@ -2450,18 +2450,10 @@ static void fbo_blitter_free(struct wined3d_device *device)
{ {
} }
static HRESULT fbo_blitter_colour_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, static void fbo_blitter_clear(struct wined3d_device *device, struct wined3d_rendertarget_view *view,
const RECT *rect, const struct wined3d_color *colour) const RECT *rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil)
{ {
ERR("This blitter does not implement colour fills.\n"); ERR("This blitter does not implement clears.\n");
return E_NOTIMPL;
}
static HRESULT fbo_blitter_depth_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view,
const RECT *rect, DWORD clear_flags, float depth, DWORD stencil)
{
ERR("This blitter does not implement depth/stencil fills.\n");
return E_NOTIMPL;
} }
static void fbo_blitter_blit(struct wined3d_device *device, enum wined3d_blit_op op, static void fbo_blitter_blit(struct wined3d_device *device, enum wined3d_blit_op op,
@ -2492,8 +2484,7 @@ const struct wined3d_blitter_ops fbo_blitter_ops =
fbo_blitter_alloc, fbo_blitter_alloc,
fbo_blitter_free, fbo_blitter_free,
fbo_blitter_supported, fbo_blitter_supported,
fbo_blitter_colour_fill, fbo_blitter_clear,
fbo_blitter_depth_fill,
fbo_blitter_blit, fbo_blitter_blit,
}; };
@ -2574,27 +2565,21 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info,
} }
} }
static HRESULT ffp_blit_color_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, static void ffp_blit_clear(struct wined3d_device *device, struct wined3d_rendertarget_view *view,
const RECT *rect, const struct wined3d_color *color) const RECT *rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil)
{ {
const RECT draw_rect = {0, 0, view->width, view->height}; const RECT draw_rect = {0, 0, view->width, view->height};
struct wined3d_fb_state fb = {&view, NULL}; struct wined3d_fb_state fb = {&view, NULL};
device_clear_render_targets(device, 1, &fb, 1, rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); if (flags != WINED3DCLEAR_TARGET)
return WINED3D_OK;
}
static HRESULT ffp_blit_depth_fill(struct wined3d_device *device,
struct wined3d_rendertarget_view *view, const RECT *rect, DWORD clear_flags,
float depth, DWORD stencil)
{ {
const RECT draw_rect = {0, 0, view->width, view->height};
struct wined3d_fb_state fb = {NULL, view}; struct wined3d_fb_state fb = {NULL, view};
device_clear_render_targets(device, 0, &fb, 1, rect, &draw_rect, clear_flags, NULL, depth, stencil); device_clear_render_targets(device, 0, &fb, 1, rect, &draw_rect, flags, NULL, depth, stencil);
return;
}
return WINED3D_OK; device_clear_render_targets(device, 1, &fb, 1, rect, &draw_rect, flags, colour, 0.0f, 0);
} }
static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op,
@ -2708,8 +2693,7 @@ const struct wined3d_blitter_ops ffp_blit =
ffp_blit_alloc, ffp_blit_alloc,
ffp_blit_free, ffp_blit_free,
ffp_blit_supported, ffp_blit_supported,
ffp_blit_color_fill, ffp_blit_clear,
ffp_blit_depth_fill,
ffp_blit_blit_surface, ffp_blit_blit_surface,
}; };
@ -3296,7 +3280,7 @@ release:
return hr; return hr;
} }
static HRESULT surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view,
const struct wined3d_box *box, const struct wined3d_color *colour) const struct wined3d_box *box, const struct wined3d_color *colour)
{ {
unsigned int x, y, w, h, bpp; unsigned int x, y, w, h, bpp;
@ -3309,7 +3293,7 @@ static HRESULT surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *vie
if (view->format_flags & WINED3DFMT_FLAG_BLOCKS) if (view->format_flags & WINED3DFMT_FLAG_BLOCKS)
{ {
FIXME("Not implemented for format %s.\n", debug_d3dformat(view->format->id)); FIXME("Not implemented for format %s.\n", debug_d3dformat(view->format->id));
return E_NOTIMPL; return;
} }
c = wined3d_format_convert_from_float(view->format, colour); c = wined3d_format_convert_from_float(view->format, colour);
@ -3356,7 +3340,7 @@ static HRESULT surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *vie
default: default:
FIXME("Not implemented for bpp %u.\n", bpp); FIXME("Not implemented for bpp %u.\n", bpp);
wined3d_resource_unmap(view->resource, view->sub_resource_idx); wined3d_resource_unmap(view->resource, view->sub_resource_idx);
return WINED3DERR_NOTAVAILABLE; return;
} }
row = map.data; row = map.data;
@ -3366,32 +3350,27 @@ static HRESULT surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *vie
memcpy(row, map.data, w * bpp); memcpy(row, map.data, w * bpp);
} }
wined3d_resource_unmap(view->resource, view->sub_resource_idx); wined3d_resource_unmap(view->resource, view->sub_resource_idx);
return WINED3D_OK;
} }
static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, static void cpu_blit_clear(struct wined3d_device *device, struct wined3d_rendertarget_view *view,
const RECT *rect, const struct wined3d_color *color) const RECT *rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil)
{ {
const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1};
struct wined3d_color c = {depth, 0.0f, 0.0f, 0.0f};
return surface_cpu_blt_colour_fill(view, &box, color); if (flags == WINED3DCLEAR_TARGET)
{
surface_cpu_blt_colour_fill(view, &box, colour);
return;
} }
static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, if (flags == WINED3DCLEAR_ZBUFFER)
struct wined3d_rendertarget_view *view, const RECT *rect, DWORD clear_flags,
float depth, DWORD stencil)
{ {
const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; surface_cpu_blt_colour_fill(view, &box, &c);
struct wined3d_color color = {depth, 0.0f, 0.0f, 0.0f}; return;
if (clear_flags != WINED3DCLEAR_ZBUFFER)
{
FIXME("clear_flags %#x not implemented.\n", clear_flags);
return WINED3DERR_INVALIDCALL;
} }
return surface_cpu_blt_colour_fill(view, &box, &color); FIXME("flags %#x not implemented.\n", flags);
} }
static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op,
@ -3408,8 +3387,7 @@ const struct wined3d_blitter_ops cpu_blit =
cpu_blit_alloc, cpu_blit_alloc,
cpu_blit_free, cpu_blit_free,
cpu_blit_supported, cpu_blit_supported,
cpu_blit_color_fill, cpu_blit_clear,
cpu_blit_depth_fill,
cpu_blit_blit_surface, cpu_blit_blit_surface,
}; };

6
dlls/wined3d/wined3d_private.h
View File

@ -1875,10 +1875,8 @@ struct wined3d_blitter_ops
const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, 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 *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); const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format);
HRESULT (*color_fill)(struct wined3d_device *device, struct wined3d_rendertarget_view *view, void (*blitter_clear)(struct wined3d_device *device, struct wined3d_rendertarget_view *view,
const RECT *rect, const struct wined3d_color *color); const RECT *rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil);
HRESULT (*depth_fill)(struct wined3d_device *device, struct wined3d_rendertarget_view *view,
const RECT *rect, DWORD clear_flags, float depth, DWORD stencil);
void (*blit_surface)(struct wined3d_device *device, enum wined3d_blit_op op, struct wined3d_context *context, void (*blit_surface)(struct wined3d_device *device, enum wined3d_blit_op op, struct wined3d_context *context,
struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect,
struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect,