system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

wined3d: Get rid of the surface refcounting functions.

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 2016-01-28 18:40:26 +01:00 committed by Alexandre Julliard
parent d6e7f18c84
commit a96abff808
3 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
dlls/wined3d/surface.c
View file

@ -1093,12 +1093,20 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win
static ULONG surface_resource_incref(struct wined3d_resource *resource)
{
return wined3d_surface_incref(surface_from_resource(resource));
struct wined3d_surface *surface = surface_from_resource(resource);
TRACE("surface %p, container %p.\n", surface, surface->container);
return wined3d_texture_incref(surface->container);
}
static ULONG surface_resource_decref(struct wined3d_resource *resource)
{
return wined3d_surface_decref(surface_from_resource(resource));
struct wined3d_surface *surface = surface_from_resource(resource);
TRACE("surface %p, container %p.\n", surface, surface->container);
return wined3d_texture_decref(surface->container);
}
static void surface_unload(struct wined3d_resource *resource)
@ -1859,20 +1867,6 @@ static inline unsigned short float_32_to_16(const float *in)
return ret;
}
ULONG CDECL wined3d_surface_incref(struct wined3d_surface *surface)
{
TRACE("surface %p, container %p.\n", surface, surface->container);
return wined3d_texture_incref(surface->container);
}
ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface)
{
TRACE("surface %p, container %p.\n", surface, surface->container);
return wined3d_texture_decref(surface->container);
}
void CDECL wined3d_surface_preload(struct wined3d_surface *surface)
{
TRACE("surface %p.\n", surface);

2
dlls/wined3d/wined3d.spec
View file

@ -223,14 +223,12 @@
@ cdecl wined3d_stateblock_incref(ptr)
@ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long)
@ cdecl wined3d_surface_decref(ptr)
@ cdecl wined3d_surface_from_resource(ptr)
@ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr)
@ cdecl wined3d_surface_get_parent(ptr)
@ cdecl wined3d_surface_get_pitch(ptr)
@ cdecl wined3d_surface_get_resource(ptr)
@ cdecl wined3d_surface_getdc(ptr ptr)
@ cdecl wined3d_surface_incref(ptr)
@ cdecl wined3d_surface_map(ptr ptr ptr long)
@ cdecl wined3d_surface_preload(ptr)
@ cdecl wined3d_surface_releasedc(ptr ptr)

2
include/wine/wined3d.h
View file

@ -2475,14 +2475,12 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock);
HRESULT __cdecl wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect,
struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags,
const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter);
ULONG __cdecl wined3d_surface_decref(struct wined3d_surface *surface);
struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_resource *resource);
HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y);
void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface);
DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface);
struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface);
HRESULT __cdecl wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc);
ULONG __cdecl wined3d_surface_incref(struct wined3d_surface *surface);
HRESULT __cdecl wined3d_surface_map(struct wined3d_surface *surface,
struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags);
void __cdecl wined3d_surface_preload(struct wined3d_surface *surface);