From b2331ec79b3471f07f8aa480b5a9e53749ade874 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Mon, 6 Jul 2009 10:08:40 +0200 Subject: [PATCH] wined3d: Get rid of the unused gl_version and glx_version fields. --- dlls/wined3d/directx.c | 7 ++++--- dlls/wined3d/wined3d_gl.h | 4 ---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fa89621dfbd..9db71af1c8c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -471,6 +471,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { unsigned i; HDC hdc; unsigned int vidmem=0; + DWORD gl_version; TRACE_(d3d_caps)("(%p)\n", gl_info); @@ -539,7 +540,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { minor = atoi(gl_string_cursor); TRACE_(d3d_caps)("Found OpenGL version: %d.%d.\n", major, minor); - gl_info->gl_version = MAKEDWORD_VERSION(major, minor); + gl_version = MAKEDWORD_VERSION(major, minor); /* Now parse the driver specific string which we'll report to the app. */ switch (gl_info->gl_vendor) @@ -765,7 +766,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { { \ DWORD ver = ver_for_ext(ext); \ if (gl_info->supported[ext]) gl_info->pfn = (type)pwglGetProcAddress(#pfn); \ - else if (ver && ver <= gl_info->gl_version) gl_info->pfn = (type)pwglGetProcAddress(#replace); \ + else if (ver && ver <= gl_version) gl_info->pfn = (type)pwglGetProcAddress(#replace); \ else gl_info->pfn = NULL; \ } GL_EXT_FUNCS_GEN; @@ -783,7 +784,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) { if (!gl_info->supported[EXTENSION_MAP[i].extension] - && EXTENSION_MAP[i].version <= gl_info->gl_version && EXTENSION_MAP[i].version) + && EXTENSION_MAP[i].version <= gl_version && EXTENSION_MAP[i].version) { TRACE_(d3d_caps)(" GL CORE: %s support.\n", EXTENSION_MAP[i].extension_string); gl_info->supported[EXTENSION_MAP[i].extension] = TRUE; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 0c5cae58f63..8471842f522 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3949,10 +3949,6 @@ typedef BOOL (WINAPI * WINED3D_PFNWGLSETPIXELFORMATWINE) (HDC hdc, int iPixelFor #define USE_GL_FUNC(type, pfn, ext, replace) type pfn; typedef struct _WineD3D_GL_Info { - - DWORD glx_version; - DWORD gl_version; - GL_Vendors gl_vendor; GL_Cards gl_card; UINT vidmem;