Henri Verbeet : wined3d: Rename WineD3DAdapterChangeGLRam() to adapter_adjust_memory().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 78cbe0bc74118eed5313335abf00619c92acf7fc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=78cbe0bc74118eed5313335abf...

Author: Henri Verbeet 
Date:   Sun Aug 28 23:27:45 2011 +0200

wined3d: Rename WineD3DAdapterChangeGLRam() to adapter_adjust_memory().

And make it work on an adapter instead of a device.

---

dlls/wined3d/directx.c         |    8 +++-----
 dlls/wined3d/resource.c        |    4 ++--
 dlls/wined3d/wined3d_private.h |    3 ++-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 515bc46..ba2e970 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -369,12 +369,10 @@ fail:
 }

/* Adjust the amount of used texture memory */
-unsigned int WineD3DAdapterChangeGLRam(struct wined3d_device *device, int glram)
+unsigned int adapter_adjust_memory(struct wined3d_adapter *adapter, int amount)
 {
-    struct wined3d_adapter *adapter = device->adapter;
-
-    adapter->UsedTextureRam += glram;
-    TRACE("Adjusted gl ram by %d to %d\n", glram, adapter->UsedTextureRam);
+    adapter->UsedTextureRam += amount;
+    TRACE("Adjusted adapter memory by %d to %d.\n", amount, adapter->UsedTextureRam);
     return adapter->UsedTextureRam;
 }

diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 4dbe46e..4ff560d 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -131,7 +131,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
             HeapFree(GetProcessHeap(), 0, resource->heapMemory);
             return WINED3DERR_OUTOFVIDEOMEMORY;
         }
-        WineD3DAdapterChangeGLRam(device, size);
+        adapter_adjust_memory(device->adapter, size);
     }

device_resource_add(device, resource);
@@ -150,7 +150,7 @@ void resource_cleanup(struct wined3d_resource *resource)
     if (resource->pool == WINED3DPOOL_DEFAULT)
     {
         TRACE("Decrementing device memory pool by %u.\n", resource->size);
-        WineD3DAdapterChangeGLRam(resource->device,  0 - resource->size);
+        adapter_adjust_memory(resource->device->adapter, 0 - resource->size);
     }

LIST_FOR_EACH_SAFE(e1, e2, &resource->privateData)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 8fb5d27..05f2bf4 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1525,9 +1525,10 @@ struct wined3d_adapter
     const struct blit_shader *blitter;
 };

+unsigned int adapter_adjust_memory(struct wined3d_adapter *adapter, int amount) DECLSPEC_HIDDEN;
+
 BOOL initPixelFormats(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) DECLSPEC_HIDDEN;
 BOOL initPixelFormatsNoGL(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;
-extern unsigned int WineD3DAdapterChangeGLRam(struct wined3d_device *device, int glram) DECLSPEC_HIDDEN;
 extern void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

/*****************************************************************************