Skip to content

W
wine-winehq
Commit 95abd3c9 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Send sub-resource copy calls through the command stream.

Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 87192548
Show whitespace changes
Inline Side-by-side
Showing with 97 additions and 44 deletions
dlls/wined3d/cs.c
View file @ 95abd3c9
......@@ -1674,10 +1674,20 @@ HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resourc
static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void *data)
{
struct wined3d_surface *dst_surface, *src_surface = NULL;
const struct wined3d_cs_blt_sub_resource *op = data;
if (op->dst_resource->type == WINED3D_RTYPE_BUFFER)
{
if (FAILED(wined3d_buffer_copy(buffer_from_resource(op->dst_resource), op->dst_box.left,
buffer_from_resource(op->src_resource), op->src_box.left,
op->src_box.right - op->src_box.left)))
ERR("Failed to copy buffer.\n");
}
else if (op->dst_resource->type == WINED3D_RTYPE_TEXTURE_2D)
{
struct wined3d_surface *dst_surface, *src_surface = NULL;
struct wined3d_texture *dst_texture, *src_texture;
RECT src_rect, dst_rect;
RECT dst_rect, src_rect;
dst_texture = texture_from_resource(op->dst_resource);
dst_surface = dst_texture->sub_resources[op->dst_sub_resource_idx].u.surface;
......@@ -1692,6 +1702,11 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void *
if (FAILED(wined3d_surface_blt(dst_surface, &dst_rect, src_surface,
&src_rect, op->flags, &op->fx, op->filter)))
FIXME("Blit failed.\n");
}
else
{
FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(op->dst_resource->type));
}
if (op->src_resource)
wined3d_resource_release(op->src_resource);
......
dlls/wined3d/device.c
View file @ 95abd3c9
......@@ -3908,23 +3908,13 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev
unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource,
unsigned int src_sub_resource_idx, const struct wined3d_box *src_box)
{
struct wined3d_texture *dst_texture, *src_texture;
RECT dst_rect, src_rect;
HRESULT hr;
struct wined3d_box dst_box, b;
TRACE("device %p, dst_resource %p, dst_sub_resource_idx %u, dst_x %u, dst_y %u, dst_z %u, "
"src_resource %p, src_sub_resource_idx %u, src_box %s.\n",
device, dst_resource, dst_sub_resource_idx, dst_x, dst_y, dst_z,
src_resource, src_sub_resource_idx, debug_box(src_box));
if (src_box && (src_box->left >= src_box->right
|| src_box->top >= src_box->bottom
|| src_box->front >= src_box->back))
{
WARN("Invalid box %s specified.\n", debug_box(src_box));
return WINED3DERR_INVALIDCALL;
}
if (src_resource == dst_resource && src_sub_resource_idx == dst_sub_resource_idx)
{
WARN("Source and destination are the same sub-resource.\n");
......@@ -3949,73 +3939,121 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev
if (dst_resource->type == WINED3D_RTYPE_BUFFER)
{
unsigned int src_offset, size;
if (dst_sub_resource_idx)
{
WARN("Invalid dst_sub_resource_idx %u.\n", dst_sub_resource_idx);
return WINED3DERR_INVALIDCALL;
}
if (src_sub_resource_idx)
{
WARN("Invalid src_sub_resource_idx %u.\n", src_sub_resource_idx);
return WINED3DERR_INVALIDCALL;
}
if (src_box)
if (!src_box)
{
src_offset = src_box->left;
size = src_box->right - src_box->left;
b.left = 0;
b.top = 0;
b.right = src_resource->size;
b.bottom = 1;
b.front = 0;
b.back = 1;
src_box = &b;
}
else
else if ((src_box->left >= src_box->right
|| src_box->top >= src_box->bottom
|| src_box->front >= src_box->back))
{
src_offset = 0;
size = src_resource->size;
WARN("Invalid box %s specified.\n", debug_box(src_box));
return WINED3DERR_INVALIDCALL;
}
if (src_offset > src_resource->size
|| size > src_resource->size - src_offset
|| dst_x > dst_resource->size
|| size > dst_resource->size - dst_x)
if (src_box->right > src_resource->size || dst_x >= dst_resource->size
|| src_box->right - src_box->left > dst_resource->size - dst_x)
{
WARN("Invalid range specified, dst_offset %u, src_offset %u, size %u.\n",
dst_x, src_offset, size);
dst_x, src_box->left, src_box->right - src_box->left);
return WINED3DERR_INVALIDCALL;
}
return wined3d_buffer_copy(buffer_from_resource(dst_resource), dst_x,
buffer_from_resource(src_resource), src_offset, size);
dst_box.left = dst_x;
dst_box.top = 0;
dst_box.right = dst_x + (src_box->right - src_box->left);
dst_box.bottom = 1;
dst_box.front = 0;
dst_box.back = 1;
}
else if (dst_resource->type == WINED3D_RTYPE_TEXTURE_2D)
{
struct wined3d_texture *dst_texture = texture_from_resource(dst_resource);
struct wined3d_texture *src_texture = texture_from_resource(src_resource);
unsigned int src_level = src_sub_resource_idx % src_texture->level_count;
if (dst_resource->type != WINED3D_RTYPE_TEXTURE_2D)
if (dst_sub_resource_idx >= dst_texture->level_count * dst_texture->layer_count)
{
FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type));
WARN("Invalid destination sub-resource %u.\n", dst_sub_resource_idx);
return WINED3DERR_INVALIDCALL;
}
dst_texture = texture_from_resource(dst_resource);
src_texture = texture_from_resource(src_resource);
if (src_sub_resource_idx >= src_texture->level_count * src_texture->layer_count)
{
WARN("Invalid source sub-resource %u.\n", src_sub_resource_idx);
return WINED3DERR_INVALIDCALL;
}
if (src_box)
if (dst_texture->sub_resources[dst_sub_resource_idx].map_count)
{
SetRect(&src_rect, src_box->left, src_box->top, src_box->right, src_box->bottom);
WARN("Destination sub-resource %u is mapped.\n", dst_sub_resource_idx);
return WINED3DERR_INVALIDCALL;
}
else
if (src_texture->sub_resources[src_sub_resource_idx].map_count)
{
unsigned int level = src_sub_resource_idx % src_texture->level_count;
WARN("Source sub-resource %u is mapped.\n", src_sub_resource_idx);
return WINED3DERR_INVALIDCALL;
}
SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(src_texture, level),
wined3d_texture_get_level_height(src_texture, level));
if (!src_box)
{
b.left = 0;
b.top = 0;
b.right = wined3d_texture_get_level_width(src_texture, src_level);
b.bottom = wined3d_texture_get_level_height(src_texture, src_level);
b.front = 0;
b.back = 1;
src_box = &b;
}
else if (FAILED(wined3d_texture_check_box_dimensions(src_texture, src_level, src_box)))
{
WARN("Invalid source box %s.\n", debug_box(src_box));
return WINED3DERR_INVALIDCALL;
}
SetRect(&dst_rect, dst_x, dst_y, dst_x + (src_rect.right - src_rect.left),
dst_y + (src_rect.bottom - src_rect.top));
dst_box.left = dst_x;
dst_box.top = dst_y;
dst_box.right = dst_x + (src_box->right - src_box->left);
dst_box.bottom = dst_y + (src_box->bottom - src_box->top);
dst_box.front = 0;
dst_box.back = 1;
if (FAILED(wined3d_texture_check_box_dimensions(dst_texture,
dst_sub_resource_idx % dst_texture->level_count, &dst_box)))
{
WARN("Invalid destination box %s.\n", debug_box(&dst_box));
return WINED3DERR_INVALIDCALL;
}
}
else
{
FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type));
return WINED3DERR_INVALIDCALL;
}
if (FAILED(hr = wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &dst_rect,
src_texture, src_sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT)))
WARN("Failed to blit, hr %#x.\n", hr);
wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, dst_sub_resource_idx, &dst_box,
src_resource, src_sub_resource_idx, src_box, 0, NULL, WINED3D_TEXF_POINT);
return hr;
return WINED3D_OK;
}
void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment