system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-20 06:38:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

wined3d: Merge wined3d_volume_{inc, dec}ref in their respective caller.

Browse source 
Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Riccardo Bortolato 2015-10-07 19:04:35 +02:00 committed by Alexandre Julliard
parent 33bb9e9610
commit cee9409ab8
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
dlls/wined3d/volume.c
View file

@ -460,20 +460,6 @@ static void volume_unload(struct wined3d_resource *resource)
resource_unload(resource);
}
static ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume)
{
TRACE("Forwarding to container %p.\n", volume->container);
return wined3d_texture_incref(volume->container);
}
static ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume)
{
TRACE("Forwarding to container %p.\n", volume->container);
return wined3d_texture_decref(volume->container);
}
static BOOL volume_check_block_align(const struct wined3d_volume *volume,
const struct wined3d_box *box)
{
@ -700,12 +686,18 @@ HRESULT wined3d_volume_unmap(struct wined3d_volume *volume)
static ULONG volume_resource_incref(struct wined3d_resource *resource)
{
return wined3d_volume_incref(volume_from_resource(resource));
struct wined3d_volume *volume = volume_from_resource(resource);
TRACE("Forwarding to container %p.\n", volume->container);
return wined3d_texture_incref(volume->container);
}
static ULONG volume_resource_decref(struct wined3d_resource *resource)
{
return wined3d_volume_decref(volume_from_resource(resource));
struct wined3d_volume *volume = volume_from_resource(resource);
TRACE("Forwarding to container %p.\n", volume->container);
return wined3d_texture_decref(volume->container);
}
static const struct wined3d_resource_ops volume_resource_ops =