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

wined3d: Free volume sysmem after upload.

This commit is contained in:
Stefan Dösinger 2013-08-22 23:22:46 +02:00 committed by Alexandre Julliard
parent a89f2e6301
commit 5ff1237563
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/wined3d/volume.c
View File

@ -112,6 +112,26 @@ static void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DW
TRACE("new location flags are %s.\n", wined3d_debug_location(volume->locations)); TRACE("new location flags are %s.\n", wined3d_debug_location(volume->locations));
} }
/* Context activation is done by the caller. */
static void wined3d_volume_download_data(struct wined3d_volume *volume,
const struct wined3d_context *context)
{
const struct wined3d_gl_info *gl_info = context->gl_info;
const struct wined3d_format *format = volume->resource.format;
gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_3D, volume->texture_level,
format->glFormat, format->glType, volume->resource.allocatedMemory);
checkGLcall("glGetTexImage");
}
static void wined3d_volume_evict_sysmem(struct wined3d_volume *volume)
{
wined3d_resource_free_sysmem(volume->resource.heap_memory);
volume->resource.heap_memory = NULL;
volume->resource.allocatedMemory = NULL;
wined3d_volume_invalidate_location(volume, WINED3D_LOCATION_SYSMEM);
}
/* Context activation is done by the caller. */ /* Context activation is done by the caller. */
static void wined3d_volume_load_location(struct wined3d_volume *volume, static void wined3d_volume_load_location(struct wined3d_volume *volume,
struct wined3d_context *context, DWORD location) struct wined3d_context *context, DWORD location)
@ -160,6 +180,10 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume,
return; return;
} }
wined3d_volume_validate_location(volume, WINED3D_LOCATION_TEXTURE_RGB); wined3d_volume_validate_location(volume, WINED3D_LOCATION_TEXTURE_RGB);
if (volume->resource.pool == WINED3D_POOL_MANAGED && volume->download_count < 10)
wined3d_volume_evict_sysmem(volume);
break; break;
case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_SYSMEM:
@ -174,6 +198,12 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume,
TRACE("Volume previously discarded, nothing to do.\n"); TRACE("Volume previously discarded, nothing to do.\n");
wined3d_volume_invalidate_location(volume, WINED3D_LOCATION_DISCARDED); wined3d_volume_invalidate_location(volume, WINED3D_LOCATION_DISCARDED);
} }
else if (volume->locations & WINED3D_LOCATION_TEXTURE_RGB)
{
volume_bind_and_dirtify(volume, context);
volume->download_count++;
wined3d_volume_download_data(volume, context);
}
else else
{ {
FIXME("Implement WINED3D_LOCATION_SYSMEM loading from %s.\n", FIXME("Implement WINED3D_LOCATION_SYSMEM loading from %s.\n",

1
dlls/wined3d/wined3d_private.h
View File

@ -2067,6 +2067,7 @@ struct wined3d_volume
DWORD flags, locations; DWORD flags, locations;
GLint texture_level; GLint texture_level;
DWORD download_count;
}; };
static inline struct wined3d_volume *volume_from_resource(struct wined3d_resource *resource) static inline struct wined3d_volume *volume_from_resource(struct wined3d_resource *resource)