wined3d: Get rid of the WINED3DDECLMETHOD typedef.

dlls/d3d10core/inputlayout.c

@@ -80,7 +80,7 @@ static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEME
                 e->input_slot = f->InputSlot;
                 e->offset = f->AlignedByteOffset;
                 e->output_slot = is.elements[j].register_idx;
-                e->method = WINED3DDECLMETHOD_DEFAULT;
+                e->method = WINED3D_DECL_METHOD_DEFAULT;
                 e->usage = 0;
                 e->usage_idx = 0;
 

dlls/d3d8/vertexdeclaration.c

@@ -335,7 +335,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3
             element->input_slot = stream;
             element->offset = offset;
             element->output_slot = reg;
-            element->method = WINED3DDECLMETHOD_DEFAULT;
+            element->method = WINED3D_DECL_METHOD_DEFAULT;
             element->usage = wined3d_usage_lookup[reg].usage;
             element->usage_idx = wined3d_usage_lookup[reg].usage_idx;
 

dlls/wined3d/utils.c

@@ -1934,19 +1934,21 @@ const char *debug_d3dusagequery(DWORD usagequery)
     return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0";
 }
 
-const char* debug_d3ddeclmethod(WINED3DDECLMETHOD method) {
-    switch (method) {
+const char *debug_d3ddeclmethod(enum wined3d_decl_method method)
+{
+    switch (method)
+    {
 #define WINED3DDECLMETHOD_TO_STR(u) case u: return #u
-        WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_DEFAULT);
-        WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_PARTIALU);
-        WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_PARTIALV);
-        WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_CROSSUV);
-        WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_UV);
-        WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_LOOKUP);
-        WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_LOOKUPPRESAMPLED);
+        WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_DEFAULT);
+        WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_PARTIAL_U);
+        WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_PARTIAL_V);
+        WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_CROSS_UV);
+        WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_UV);
+        WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_LOOKUP);
+        WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_LOOKUP_PRESAMPLED);
 #undef WINED3DDECLMETHOD_TO_STR
         default:
-            FIXME("Unrecognized %u declaration method!\n", method);
+            FIXME("Unrecognized declaration method %#x.\n", method);
             return "unrecognized";
     }
 }

dlls/wined3d/vertexdeclaration.c

@@ -289,7 +289,7 @@ static void append_decl_element(struct wined3d_fvf_convert_state *state,
     elements[idx].input_slot = 0;
     elements[idx].offset = offset;
     elements[idx].output_slot = 0;
-    elements[idx].method = WINED3DDECLMETHOD_DEFAULT;
+    elements[idx].method = WINED3D_DECL_METHOD_DEFAULT;
     elements[idx].usage = usage;
     elements[idx].usage_idx = usage_idx;
 

dlls/wined3d/wined3d_private.h

@@ -2491,7 +2491,7 @@ const char *debug_d3ddevicetype(enum wined3d_device_type device_type) DECLSPEC_H
 const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) DECLSPEC_HIDDEN;
 const char *debug_d3dusage(DWORD usage) DECLSPEC_HIDDEN;
 const char *debug_d3dusagequery(DWORD usagequery) DECLSPEC_HIDDEN;
-const char *debug_d3ddeclmethod(WINED3DDECLMETHOD method) DECLSPEC_HIDDEN;
+const char *debug_d3ddeclmethod(enum wined3d_decl_method method) DECLSPEC_HIDDEN;
 const char *debug_d3ddeclusage(BYTE usage) DECLSPEC_HIDDEN;
 const char *debug_d3dprimitivetype(enum wined3d_primitive_type primitive_type) DECLSPEC_HIDDEN;
 const char *debug_d3drenderstate(enum wined3d_render_state state) DECLSPEC_HIDDEN;

include/wine/wined3d.h

@@ -719,16 +719,16 @@ enum wined3d_stateblock_type
     WINED3D_SBT_RECORDED                    = 4, /* WineD3D private */
 };
 
-typedef enum _WINED3DDECLMETHOD
-{
-    WINED3DDECLMETHOD_DEFAULT               = 0,
-    WINED3DDECLMETHOD_PARTIALU              = 1,
-    WINED3DDECLMETHOD_PARTIALV              = 2,
-    WINED3DDECLMETHOD_CROSSUV               = 3,
-    WINED3DDECLMETHOD_UV                    = 4,
-    WINED3DDECLMETHOD_LOOKUP                = 5,
-    WINED3DDECLMETHOD_LOOKUPPRESAMPLED      = 6
-} WINED3DDECLMETHOD;
+enum wined3d_decl_method
+{
+    WINED3D_DECL_METHOD_DEFAULT             = 0,
+    WINED3D_DECL_METHOD_PARTIAL_U           = 1,
+    WINED3D_DECL_METHOD_PARTIAL_V           = 2,
+    WINED3D_DECL_METHOD_CROSS_UV            = 3,
+    WINED3D_DECL_METHOD_UV                  = 4,
+    WINED3D_DECL_METHOD_LOOKUP              = 5,
+    WINED3D_DECL_METHOD_LOOKUP_PRESAMPLED   = 6,
+};
 
 typedef enum _WINED3DDECLUSAGE
 {