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

wined3d: Get resource info from the texture in wined3d_surface_upload_data(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2016-03-16 18:16:57 +01:00 committed by Alexandre Julliard
parent aa1fe8cfb1
commit 55165bf6d0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/wined3d/surface.c
View File

@ -1273,6 +1273,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w
const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point,
BOOL srgb, const struct wined3d_const_bo_address *data) BOOL srgb, const struct wined3d_const_bo_address *data)
{ {
struct wined3d_texture *texture = surface->container;
UINT update_w = src_rect->right - src_rect->left; UINT update_w = src_rect->right - src_rect->left;
UINT update_h = src_rect->bottom - src_rect->top; UINT update_h = src_rect->bottom - src_rect->top;
@ -1283,7 +1284,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w
if (surface->resource.map_count) if (surface->resource.map_count)
{ {
WARN("Uploading a surface that is currently mapped, setting WINED3D_TEXTURE_PIN_SYSMEM.\n"); WARN("Uploading a surface that is currently mapped, setting WINED3D_TEXTURE_PIN_SYSMEM.\n");
surface->container->flags |= WINED3D_TEXTURE_PIN_SYSMEM; texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM;
} }
if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_HEIGHT_SCALE) if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_HEIGHT_SCALE)
@ -1310,8 +1311,8 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w
if (srgb) if (srgb)
internal = format->glGammaInternal; internal = format->glGammaInternal;
else if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET
&& wined3d_resource_is_offscreen(&surface->container->resource)) && wined3d_resource_is_offscreen(&texture->resource))
internal = format->rtInternal; internal = format->rtInternal;
else else
internal = format->glInternal; internal = format->glInternal;
@ -1370,7 +1371,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w
if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE) if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE)
{ {
struct wined3d_device *device = surface->resource.device; struct wined3d_device *device = texture->resource.device;
unsigned int i; unsigned int i;
for (i = 0; i < device->context_count; ++i) for (i = 0; i < device->context_count; ++i)