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

wined3d: Replace VFLAG_PBO with resource->map_binding.

This commit is contained in:
Stefan Dösinger 2014-08-26 10:35:46 +02:00 committed by Alexandre Julliard
parent c87901d3f8
commit 7a1533a41c
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/wined3d/volume.c
View File

@ -364,7 +364,7 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume,
break; break;
case WINED3D_LOCATION_BUFFER: case WINED3D_LOCATION_BUFFER:
if (!volume->pbo || !(volume->flags & WINED3D_VFLAG_PBO)) if (!volume->pbo)
ERR("Trying to load WINED3D_LOCATION_BUFFER without setting it up first.\n"); ERR("Trying to load WINED3D_LOCATION_BUFFER without setting it up first.\n");
if (volume->locations & WINED3D_LOCATION_DISCARDED) if (volume->locations & WINED3D_LOCATION_DISCARDED)
@ -627,7 +627,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume,
flags = wined3d_resource_sanitize_map_flags(&volume->resource, flags); flags = wined3d_resource_sanitize_map_flags(&volume->resource, flags);
if (volume->flags & WINED3D_VFLAG_PBO) if (volume->resource.map_binding == WINED3D_LOCATION_BUFFER)
{ {
context = context_acquire(device, NULL); context = context_acquire(device, NULL);
gl_info = context->gl_info; gl_info = context->gl_info;
@ -723,11 +723,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume,
if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY)))
{ {
wined3d_texture_set_dirty(volume->container); wined3d_texture_set_dirty(volume->container);
wined3d_volume_invalidate_location(volume, ~volume->resource.map_binding);
if (volume->flags & WINED3D_VFLAG_PBO)
wined3d_volume_invalidate_location(volume, ~WINED3D_LOCATION_BUFFER);
else
wined3d_volume_invalidate_location(volume, ~WINED3D_LOCATION_SYSMEM);
} }
volume->resource.map_count++; volume->resource.map_count++;
@ -753,7 +749,7 @@ HRESULT CDECL wined3d_volume_unmap(struct wined3d_volume *volume)
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
if (volume->flags & WINED3D_VFLAG_PBO) if (volume->resource.map_binding == WINED3D_LOCATION_BUFFER)
{ {
struct wined3d_device *device = volume->resource.device; struct wined3d_device *device = volume->resource.device;
struct wined3d_context *context = context_acquire(device, NULL); struct wined3d_context *context = context_acquire(device, NULL);
@ -824,13 +820,14 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_texture
volume->texture_level = level; volume->texture_level = level;
volume->locations = WINED3D_LOCATION_DISCARDED; volume->locations = WINED3D_LOCATION_DISCARDED;
volume->resource.map_binding = WINED3D_LOCATION_SYSMEM;
if (desc->pool == WINED3D_POOL_DEFAULT && desc->usage & WINED3DUSAGE_DYNAMIC if (desc->pool == WINED3D_POOL_DEFAULT && desc->usage & WINED3DUSAGE_DYNAMIC
&& gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]
&& !format->convert) && !format->convert)
{ {
wined3d_resource_free_sysmem(&volume->resource); wined3d_resource_free_sysmem(&volume->resource);
volume->flags |= WINED3D_VFLAG_PBO; volume->resource.map_binding = WINED3D_LOCATION_BUFFER;
} }
volume->container = container; volume->container = container;

3
dlls/wined3d/wined3d_private.h
View File

@ -2172,8 +2172,7 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture,
#define WINED3D_VFLAG_ALLOCATED 0x00000001 #define WINED3D_VFLAG_ALLOCATED 0x00000001
#define WINED3D_VFLAG_SRGB_ALLOCATED 0x00000002 #define WINED3D_VFLAG_SRGB_ALLOCATED 0x00000002
#define WINED3D_VFLAG_PBO 0x00000004 #define WINED3D_VFLAG_CLIENT_STORAGE 0x00000004
#define WINED3D_VFLAG_CLIENT_STORAGE 0x00000008
#define WINED3D_LOCATION_DISCARDED 0x00000001 #define WINED3D_LOCATION_DISCARDED 0x00000001
#define WINED3D_LOCATION_SYSMEM 0x00000002 #define WINED3D_LOCATION_SYSMEM 0x00000002