Francois Gouget : wined3d: Make wined3d_event_query_test() and resource_get_type() static.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6c8c68f7b6cef598a677edb76ddb5d45f0d00cf2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6c8c68f7b6cef598a677edb76d...

Author: Francois Gouget 
Date:   Tue May  3 00:37:55 2011 +0200

wined3d: Make wined3d_event_query_test() and resource_get_type() static.

---

dlls/wined3d/query.c           |    2 +-
 dlls/wined3d/resource.c        |    6 ------
 dlls/wined3d/wined3d_private.h |    2 --
 3 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 1751609..4e1eed27 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -37,7 +37,7 @@ void wined3d_event_query_destroy(struct wined3d_event_query *query)
     HeapFree(GetProcessHeap(), 0, query);
 }

-enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_event_query *query, IWineD3DDeviceImpl *device)
+static enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_event_query *query, IWineD3DDeviceImpl *device)
 {
     struct wined3d_context *context;
     const struct wined3d_gl_info *gl_info;
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index cdc483d..3807e89 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -272,12 +272,6 @@ DWORD resource_get_priority(const struct wined3d_resource *resource)
     return resource->priority;
 }

-WINED3DRESOURCETYPE resource_get_type(const struct wined3d_resource *resource)
-{
-    TRACE("resource %p, returning %#x.\n", resource, resource->resourceType);
-    return resource->resourceType;
-}
-
 void * CDECL wined3d_resource_get_parent(const struct wined3d_resource *resource)
 {
     return resource->parent;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 17bcc7a..955595c 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1027,7 +1027,6 @@ enum wined3d_event_query_result
 };

void wined3d_event_query_destroy(struct wined3d_event_query *query) DECLSPEC_HIDDEN;
-enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN;
 enum wined3d_event_query_result wined3d_event_query_finish(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN;
 void wined3d_event_query_issue(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN;
 BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;
@@ -1838,7 +1837,6 @@ HRESULT resource_init(struct wined3d_resource *resource, IWineD3DDeviceImpl *dev
         DWORD usage, WINED3DPOOL pool, UINT width, UINT height, UINT depth, UINT size,
         void *parent, const struct wined3d_parent_ops *parent_ops,
         const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN;
-WINED3DRESOURCETYPE resource_get_type(const struct wined3d_resource *resource) DECLSPEC_HIDDEN;
 DWORD resource_set_priority(struct wined3d_resource *resource, DWORD priority) DECLSPEC_HIDDEN;
 HRESULT resource_set_private_data(struct wined3d_resource *resource, REFGUID guid,
         const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN;