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

wined3d: Do not download textures to WINED3D_LOCATION_BUFFER in wined3d_texture_gl_unload(). 

Since we remove any potential PBO a few lines later.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2019-12-03 20:06:00 +03:30 committed by Alexandre Julliard
parent b941665b42
commit 153db6a757
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/wined3d/texture.c
View File

@ -2942,6 +2942,7 @@ static void wined3d_texture_gl_unload(struct wined3d_resource *resource)
UINT sub_count = texture_gl->t.level_count * texture_gl->t.layer_count; UINT sub_count = texture_gl->t.level_count * texture_gl->t.layer_count;
struct wined3d_renderbuffer_entry *entry, *entry2; struct wined3d_renderbuffer_entry *entry, *entry2;
struct wined3d_device *device = resource->device; struct wined3d_device *device = resource->device;
unsigned int location = resource->map_binding;
const struct wined3d_gl_info *gl_info; const struct wined3d_gl_info *gl_info;
struct wined3d_context *context; struct wined3d_context *context;
UINT i; UINT i;
@ -2951,14 +2952,17 @@ static void wined3d_texture_gl_unload(struct wined3d_resource *resource)
context = context_acquire(device, NULL, 0); context = context_acquire(device, NULL, 0);
gl_info = wined3d_context_gl(context)->gl_info; gl_info = wined3d_context_gl(context)->gl_info;
if (location == WINED3D_LOCATION_BUFFER)
location = WINED3D_LOCATION_SYSMEM;
for (i = 0; i < sub_count; ++i) for (i = 0; i < sub_count; ++i)
{ {
struct wined3d_texture_sub_resource *sub_resource = &texture_gl->t.sub_resources[i]; struct wined3d_texture_sub_resource *sub_resource = &texture_gl->t.sub_resources[i];
if (resource->access & WINED3D_RESOURCE_ACCESS_CPU if (resource->access & WINED3D_RESOURCE_ACCESS_CPU
&& wined3d_texture_load_location(&texture_gl->t, i, context, resource->map_binding)) && wined3d_texture_load_location(&texture_gl->t, i, context, location))
{ {
wined3d_texture_invalidate_location(&texture_gl->t, i, ~resource->map_binding); wined3d_texture_invalidate_location(&texture_gl->t, i, ~location);
} }
else else
{ {