Henri Verbeet : wined3d: Get rid of the GL_SupportedExt typedef.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5d6f29818f24236f66b4ff7c7742f3ae41b9afcc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5d6f29818f24236f66b4ff7c77...

Author: Henri Verbeet 
Date:   Sun Jul  3 22:27:23 2011 +0200

wined3d: Get rid of the GL_SupportedExt typedef.

---

dlls/wined3d/directx.c         |   11 +++++++----
 dlls/wined3d/utils.c           |    2 +-
 dlls/wined3d/wined3d_gl.h      |    4 ++--
 dlls/wined3d/wined3d_private.h |    2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 504cb2c..8453af1 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -72,11 +72,14 @@ enum wined3d_gl_vendor
 static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } };

/* Extension detection */
-static const struct {
+static const struct
+{
     const char *extension_string;
-    GL_SupportedExt extension;
+    enum wined3d_gl_extension extension;
     DWORD version;
-} EXTENSION_MAP[] = {
+}
+EXTENSION_MAP[] =
+{
     /* APPLE */
     {"GL_APPLE_client_storage",             APPLE_CLIENT_STORAGE,           0                           },
     {"GL_APPLE_fence",                      APPLE_FENCE,                    0                           },
@@ -446,7 +449,7 @@ static inline BOOL test_arb_vs_offset_limit(const struct wined3d_gl_info *gl_inf
     return ret;
 }

-static DWORD ver_for_ext(GL_SupportedExt ext)
+static DWORD ver_for_ext(enum wined3d_gl_extension ext)
 {
     unsigned int i;
     for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) {
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index fe767ea..25cb4ee 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -249,7 +249,7 @@ struct wined3d_format_texture_info
     GLint gl_type;
     unsigned int conv_byte_count;
     unsigned int flags;
-    GL_SupportedExt extension;
+    enum wined3d_gl_extension extension;
     void (*convert)(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height);
 };

diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index 85e5fea..24c366e 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -1721,7 +1721,7 @@ BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN;
     USE_WGL_FUNC(wglShareLists)

/* OpenGL extensions. */
-typedef enum wined3d_gl_extension
+enum wined3d_gl_extension
 {
     WINED3D_GL_EXT_NONE,

@@ -1845,7 +1845,7 @@ typedef enum wined3d_gl_extension
     WINED3D_GL_VERSION_2_0,

WINED3D_GL_EXT_COUNT,
-} GL_SupportedExt;
+};

/* GL_APPLE_client_storage */
 #ifndef GL_APPLE_client_storage
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 79b6f27..f4947f1 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1139,7 +1139,7 @@ struct StateEntryTemplate
 {
     DWORD state;
     struct StateEntry content;
-    GL_SupportedExt extension;
+    enum wined3d_gl_extension extension;
 };

struct fragment_caps