ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Get rid of the GL_SupportedExt typedef.

This commit is contained in:
Henri Verbeet 2011-07-03 22:27:23 +02:00 committed by Alexandre Julliard
parent 82d74d563a
commit 5d6f29818f
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/wined3d/directx.c
View File

@ -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 } }; static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } };
/* Extension detection */ /* Extension detection */
static const struct { static const struct
{
const char *extension_string; const char *extension_string;
GL_SupportedExt extension; enum wined3d_gl_extension extension;
DWORD version; DWORD version;
} EXTENSION_MAP[] = { }
EXTENSION_MAP[] =
{
/* APPLE */ /* APPLE */
{"GL_APPLE_client_storage", APPLE_CLIENT_STORAGE, 0 }, {"GL_APPLE_client_storage", APPLE_CLIENT_STORAGE, 0 },
{"GL_APPLE_fence", APPLE_FENCE, 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; return ret;
} }
static DWORD ver_for_ext(GL_SupportedExt ext) static DWORD ver_for_ext(enum wined3d_gl_extension ext)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) { for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) {

2
dlls/wined3d/utils.c
View File

@ -249,7 +249,7 @@ struct wined3d_format_texture_info
GLint gl_type; GLint gl_type;
unsigned int conv_byte_count; unsigned int conv_byte_count;
unsigned int flags; unsigned int flags;
GL_SupportedExt extension; enum wined3d_gl_extension extension;
void (*convert)(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height); void (*convert)(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height);
}; };

4
dlls/wined3d/wined3d_gl.h
View File

@ -1721,7 +1721,7 @@ BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN;
USE_WGL_FUNC(wglShareLists) USE_WGL_FUNC(wglShareLists)
/* OpenGL extensions. */ /* OpenGL extensions. */
typedef enum wined3d_gl_extension enum wined3d_gl_extension
{ {
WINED3D_GL_EXT_NONE, WINED3D_GL_EXT_NONE,
@ -1845,7 +1845,7 @@ typedef enum wined3d_gl_extension
WINED3D_GL_VERSION_2_0, WINED3D_GL_VERSION_2_0,
WINED3D_GL_EXT_COUNT, WINED3D_GL_EXT_COUNT,
} GL_SupportedExt; };
/* GL_APPLE_client_storage */ /* GL_APPLE_client_storage */
#ifndef GL_APPLE_client_storage #ifndef GL_APPLE_client_storage

2
dlls/wined3d/wined3d_private.h
View File

@ -1139,7 +1139,7 @@ struct StateEntryTemplate
{ {
DWORD state; DWORD state;
struct StateEntry content; struct StateEntry content;
GL_SupportedExt extension; enum wined3d_gl_extension extension;
}; };
struct fragment_caps struct fragment_caps