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

wined3d: Pass a texture and sub-resource index to surface_upload_from_surface(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2018-03-08 10:35:01 +03:30 committed by Alexandre Julliard
parent 4c1b3978dd
commit c337a46354
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/wined3d/surface.c
View File

@ -934,13 +934,10 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s
} }
} }
static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture,
struct wined3d_surface *src_surface, const RECT *src_rect) unsigned int dst_sub_resource_idx, const POINT *dst_point, struct wined3d_texture *src_texture,
unsigned int src_sub_resource_idx, const RECT *src_rect)
{ {
unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface);
unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface);
struct wined3d_texture *src_texture = src_surface->container;
struct wined3d_texture *dst_texture = dst_surface->container;
unsigned int src_row_pitch, src_slice_pitch; unsigned int src_row_pitch, src_slice_pitch;
const struct wined3d_gl_info *gl_info; const struct wined3d_gl_info *gl_info;
unsigned int src_level, dst_level; unsigned int src_level, dst_level;
@ -948,16 +945,17 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface,
struct wined3d_bo_address data; struct wined3d_bo_address data;
UINT update_w, update_h; UINT update_w, update_h;
TRACE("dst_surface %p, dst_point %s, src_surface %p, src_rect %s.\n", TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_point %s, "
dst_surface, wine_dbgstr_point(dst_point), "src_texture %p, src_sub_resource_idx %u, src_rect %s.\n",
src_surface, wine_dbgstr_rect(src_rect)); dst_texture, dst_sub_resource_idx, wine_dbgstr_point(dst_point),
src_texture, src_sub_resource_idx, wine_dbgstr_rect(src_rect));
context = context_acquire(dst_texture->resource.device, NULL, 0); context = context_acquire(dst_texture->resource.device, NULL, 0);
gl_info = context->gl_info; gl_info = context->gl_info;
/* Only load the surface for partial updates. For newly allocated texture /* Only load the sub-resource for partial updates. For newly allocated
* the texture wouldn't be the current location, and we'd upload zeroes * textures the texture wouldn't be the current location, and we'd upload
* just to overwrite them again. */ * zeroes just to overwrite them again. */
update_w = src_rect->right - src_rect->left; update_w = src_rect->right - src_rect->left;
update_h = src_rect->bottom - src_rect->top; update_h = src_rect->bottom - src_rect->top;
dst_level = dst_sub_resource_idx % dst_texture->level_count; dst_level = dst_sub_resource_idx % dst_texture->level_count;
@ -3870,7 +3868,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const struct wi
{ {
POINT dst_point = {dst_box->left, dst_box->top}; POINT dst_point = {dst_box->left, dst_box->top};
if (SUCCEEDED(surface_upload_from_surface(dst_surface, &dst_point, src_surface, &src_rect))) if (SUCCEEDED(texture2d_upload_from_surface(dst_texture, dst_sub_resource_idx,
&dst_point, src_texture, src_sub_resource_idx, &src_rect)))
{ {
if (!wined3d_resource_is_offscreen(&dst_texture->resource)) if (!wined3d_resource_is_offscreen(&dst_texture->resource))
{ {