[PATCH 1/3] wined3d: Get rid of wined3d_device_get_wined3d().

Henri Verbeet hverbeet at codeweavers.com
Tue Sep 4 06:52:30 CDT 2012


---
 dlls/wined3d/device.c     |   12 ------------
 dlls/wined3d/wined3d.spec |    1 -
 include/wine/wined3d.h    |    1 -
 3 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 0826957..ba8c4be 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1567,18 +1567,6 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device)
     device->create_parms.flags |= WINED3DCREATE_MULTITHREADED;
 }
 
-HRESULT CDECL wined3d_device_get_wined3d(const struct wined3d_device *device, struct wined3d **wined3d)
-{
-    TRACE("device %p, wined3d %p.\n", device, wined3d);
-
-    *wined3d = device->wined3d;
-    wined3d_incref(*wined3d);
-
-    TRACE("Returning %p.\n", *wined3d);
-
-    return WINED3D_OK;
-}
-
 UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device *device)
 {
     TRACE("device %p.\n", device);
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index eed1174..6555ae8 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -94,7 +94,6 @@
 @ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long)
 @ cdecl wined3d_device_get_vs_consts_f(ptr long ptr long)
 @ cdecl wined3d_device_get_vs_consts_i(ptr long ptr long)
-@ cdecl wined3d_device_get_wined3d(ptr ptr)
 @ cdecl wined3d_device_incref(ptr)
 @ cdecl wined3d_device_init_3d(ptr ptr)
 @ cdecl wined3d_device_init_gdi(ptr ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 4a11ff2..941bd8e 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2176,7 +2176,6 @@ HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *devi
         UINT start_register, float *constants, UINT vector4f_count);
 HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device,
         UINT start_register, int *constants, UINT vector4i_count);
-HRESULT __cdecl wined3d_device_get_wined3d(const struct wined3d_device *device, struct wined3d **wined3d);
 ULONG __cdecl wined3d_device_incref(struct wined3d_device *device);
 HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc);
 HRESULT __cdecl wined3d_device_init_gdi(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc);
-- 
1.7.8.6




More information about the wine-patches mailing list