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

wined3d: Use texture3d_upload_data() in texture3d_srgb_transfer(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2016-08-01 12:49:04 +02:00 committed by Alexandre Julliard
parent 1cc4d8486b
commit 0bf35ec975
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/wined3d/texture.c
View File

@ -2122,6 +2122,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in
struct wined3d_context *context, BOOL dest_is_srgb) struct wined3d_context *context, BOOL dest_is_srgb)
{ {
struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx];
unsigned int row_pitch, slice_pitch;
struct wined3d_bo_address data; struct wined3d_bo_address data;
/* Optimisations are possible, but the effort should be put into either /* Optimisations are possible, but the effort should be put into either
@ -2135,10 +2136,12 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in
if (!(data.addr = HeapAlloc(GetProcessHeap(), 0, sub_resource->size))) if (!(data.addr = HeapAlloc(GetProcessHeap(), 0, sub_resource->size)))
return; return;
wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch);
wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb);
texture3d_download_data(texture, sub_resource_idx, context, &data); texture3d_download_data(texture, sub_resource_idx, context, &data);
wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb);
wined3d_volume_upload_data(texture, sub_resource_idx, context, wined3d_const_bo_address(&data)); texture3d_upload_data(texture, sub_resource_idx, context,
wined3d_const_bo_address(&data), row_pitch, slice_pitch);
HeapFree(GetProcessHeap(), 0, data.addr); HeapFree(GetProcessHeap(), 0, data.addr);
} }