Module: wine Branch: master Commit: ae2e5d65ff7b23aeb3bd4948933a09c89b93a11e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2e5d65ff7b23aeb3bd494893...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Jan 17 21:13:38 2012 +0100
wined3d: Get rid of the WINED3DQUERYTYPE typedef.
---
dlls/wined3d/query.c | 38 +++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 38 +++++++++++++++++++------------------- 3 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 79572a2..8298058 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -251,12 +251,12 @@ ULONG CDECL wined3d_query_decref(struct wined3d_query *query) * deleting the query will obviously leak it, but that's still better * than potentially deleting a different query with the same id in this * context, and (still) leaking the actual query. */ - if (query->type == WINED3DQUERYTYPE_EVENT) + if (query->type == WINED3D_QUERY_TYPE_EVENT) { struct wined3d_event_query *event_query = query->extendedData; if (event_query) wined3d_event_query_destroy(event_query); } - else if (query->type == WINED3DQUERYTYPE_OCCLUSION) + else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) { struct wined3d_occlusion_query *oq = query->extendedData;
@@ -412,7 +412,7 @@ static HRESULT wined3d_event_query_ops_get_data(struct wined3d_query *query, return S_OK; }
-WINED3DQUERYTYPE CDECL wined3d_query_get_type(const struct wined3d_query *query) +enum wined3d_query_type CDECL wined3d_query_get_type(const struct wined3d_query *query) { TRACE("query %p.\n", query);
@@ -547,13 +547,13 @@ static const struct wined3d_query_ops occlusion_query_ops = wined3d_occlusion_query_ops_issue, };
-static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *device, WINED3DQUERYTYPE type) +static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *device, enum wined3d_query_type type) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
switch (type) { - case WINED3DQUERYTYPE_OCCLUSION: + case WINED3D_QUERY_TYPE_OCCLUSION: TRACE("Occlusion query.\n"); if (!gl_info->supported[ARB_OCCLUSION_QUERY]) { @@ -571,7 +571,7 @@ static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *de ((struct wined3d_occlusion_query *)query->extendedData)->context = NULL; break;
- case WINED3DQUERYTYPE_EVENT: + case WINED3D_QUERY_TYPE_EVENT: TRACE("Event query.\n"); if (!wined3d_event_query_supported(gl_info)) { @@ -591,18 +591,18 @@ static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *de } break;
- case WINED3DQUERYTYPE_VCACHE: - case WINED3DQUERYTYPE_RESOURCEMANAGER: - case WINED3DQUERYTYPE_VERTEXSTATS: - case WINED3DQUERYTYPE_TIMESTAMP: - case WINED3DQUERYTYPE_TIMESTAMPDISJOINT: - case WINED3DQUERYTYPE_TIMESTAMPFREQ: - case WINED3DQUERYTYPE_PIPELINETIMINGS: - case WINED3DQUERYTYPE_INTERFACETIMINGS: - case WINED3DQUERYTYPE_VERTEXTIMINGS: - case WINED3DQUERYTYPE_PIXELTIMINGS: - case WINED3DQUERYTYPE_BANDWIDTHTIMINGS: - case WINED3DQUERYTYPE_CACHEUTILIZATION: + case WINED3D_QUERY_TYPE_VCACHE: + case WINED3D_QUERY_TYPE_RESOURCE_MANAGER: + case WINED3D_QUERY_TYPE_VERTEX_STATS: + case WINED3D_QUERY_TYPE_TIMESTAMP: + case WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT: + case WINED3D_QUERY_TYPE_TIMESTAMP_FREQ: + case WINED3D_QUERY_TYPE_PIPELINE_TIMINGS: + case WINED3D_QUERY_TYPE_INTERFACE_TIMINGS: + case WINED3D_QUERY_TYPE_VERTEX_TIMINGS: + case WINED3D_QUERY_TYPE_PIXEL_TIMINGS: + case WINED3D_QUERY_TYPE_BANDWIDTH_TIMINGS: + case WINED3D_QUERY_TYPE_CACHE_UTILIZATION: default: FIXME("Unhandled query type %#x.\n", type); return WINED3DERR_NOTAVAILABLE; @@ -617,7 +617,7 @@ static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *de }
HRESULT CDECL wined3d_query_create(struct wined3d_device *device, - WINED3DQUERYTYPE type, struct wined3d_query **query) + enum wined3d_query_type type, struct wined3d_query **query) { struct wined3d_query *object; HRESULT hr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 407d30b..08a1bac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2365,7 +2365,7 @@ struct wined3d_query const struct wined3d_query_ops *query_ops; struct wined3d_device *device; enum query_state state; - WINED3DQUERYTYPE type; + enum wined3d_query_type type; DWORD data_size; void *extendedData; }; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1f2ad7b..10a91e5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -688,23 +688,23 @@ enum wined3d_pool WINED3D_POOL_SCRATCH = 3, };
-typedef enum _WINED3DQUERYTYPE -{ - WINED3DQUERYTYPE_VCACHE = 4, - WINED3DQUERYTYPE_RESOURCEMANAGER = 5, - WINED3DQUERYTYPE_VERTEXSTATS = 6, - WINED3DQUERYTYPE_EVENT = 8, - WINED3DQUERYTYPE_OCCLUSION = 9, - WINED3DQUERYTYPE_TIMESTAMP = 10, - WINED3DQUERYTYPE_TIMESTAMPDISJOINT = 11, - WINED3DQUERYTYPE_TIMESTAMPFREQ = 12, - WINED3DQUERYTYPE_PIPELINETIMINGS = 13, - WINED3DQUERYTYPE_INTERFACETIMINGS = 14, - WINED3DQUERYTYPE_VERTEXTIMINGS = 15, - WINED3DQUERYTYPE_PIXELTIMINGS = 16, - WINED3DQUERYTYPE_BANDWIDTHTIMINGS = 17, - WINED3DQUERYTYPE_CACHEUTILIZATION = 18 -} WINED3DQUERYTYPE; +enum wined3d_query_type +{ + WINED3D_QUERY_TYPE_VCACHE = 4, + WINED3D_QUERY_TYPE_RESOURCE_MANAGER = 5, + WINED3D_QUERY_TYPE_VERTEX_STATS = 6, + WINED3D_QUERY_TYPE_EVENT = 8, + WINED3D_QUERY_TYPE_OCCLUSION = 9, + WINED3D_QUERY_TYPE_TIMESTAMP = 10, + WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT = 11, + WINED3D_QUERY_TYPE_TIMESTAMP_FREQ = 12, + WINED3D_QUERY_TYPE_PIPELINE_TIMINGS = 13, + WINED3D_QUERY_TYPE_INTERFACE_TIMINGS = 14, + WINED3D_QUERY_TYPE_VERTEX_TIMINGS = 15, + WINED3D_QUERY_TYPE_PIXEL_TIMINGS = 16, + WINED3D_QUERY_TYPE_BANDWIDTH_TIMINGS = 17, + WINED3D_QUERY_TYPE_CACHE_UTILIZATION = 18 +};
#define WINED3DISSUE_BEGIN (1 << 1) #define WINED3DISSUE_END (1 << 0) @@ -2248,11 +2248,11 @@ HRESULT __cdecl wined3d_palette_set_entries(struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries);
HRESULT __cdecl wined3d_query_create(struct wined3d_device *device, - WINED3DQUERYTYPE type, struct wined3d_query **query); + enum wined3d_query_type type, struct wined3d_query **query); ULONG __cdecl wined3d_query_decref(struct wined3d_query *query); HRESULT __cdecl wined3d_query_get_data(struct wined3d_query *query, void *data, UINT data_size, DWORD flags); UINT __cdecl wined3d_query_get_data_size(const struct wined3d_query *query); -WINED3DQUERYTYPE __cdecl wined3d_query_get_type(const struct wined3d_query *query); +enum wined3d_query_type __cdecl wined3d_query_get_type(const struct wined3d_query *query); ULONG __cdecl wined3d_query_incref(struct wined3d_query *query); HRESULT __cdecl wined3d_query_issue(struct wined3d_query *query, DWORD flags);
-
Alexandre Julliard