[v7 09/10] wined3d: Call wined3d_texture_incref() instead of wined3d_surface_incref() from surface_resource_incref().
Riccardo Bortolato
rikyz619 at gmail.com
Tue Nov 10 07:10:02 CST 2015
Removed the now unused wined3d_surface_incref() completely.
Signed-off-by: Riccardo Bortolato <rikyz619 at gmail.com>
---
dlls/wined3d/surface.c | 13 +++++--------
dlls/wined3d/wined3d.spec | 1 -
include/wine/wined3d.h | 1 -
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index c3ddc84..4f27238 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1117,7 +1117,11 @@ 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)
@@ -1875,13 +1879,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);
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index a7e625d..9d8660c 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -230,7 +230,6 @@
@ 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_is_lost(ptr)
@ cdecl wined3d_surface_map(ptr ptr ptr long)
@ cdecl wined3d_surface_preload(ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 2deb450..6f3d41b 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2486,7 +2486,6 @@ 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_is_lost(const 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);
--
1.9.1
More information about the wine-patches
mailing list