Henri Verbeet : wined3d: Remove some unused fields from struct wined3d_gl_info.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu Aug 13 10:03:05 2009 +0200

wined3d: Remove some unused fields from struct wined3d_gl_info.

---

dlls/wined3d/directx.c    |    9 ---------
 dlls/wined3d/wined3d_gl.h |    3 ---
 2 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index c158f39..045a893 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1187,14 +1187,11 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
     gl_info->max_vertex_samplers = 0;
     gl_info->max_combined_samplers = gl_info->max_fragment_samplers + gl_info->max_vertex_samplers;
     gl_info->max_sampler_stages = 1;
-    gl_info->ps_arb_version = PS_VERSION_NOT_SUPPORTED;
     gl_info->ps_arb_max_temps = 0;
     gl_info->ps_arb_max_instructions = 0;
-    gl_info->vs_arb_version = VS_VERSION_NOT_SUPPORTED;
     gl_info->vs_arb_max_temps = 0;
     gl_info->vs_arb_max_instructions = 0;
     gl_info->vs_nv_version  = VS_VERSION_NOT_SUPPORTED;
-    gl_info->vs_ati_version = VS_VERSION_NOT_SUPPORTED;
     gl_info->vs_glsl_constantsF = 0;
     gl_info->ps_glsl_constantsF = 0;
     gl_info->vs_arb_constantsF = 0;
@@ -1433,7 +1430,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
     }
     if (gl_info->supported[ARB_FRAGMENT_PROGRAM])
     {
-        gl_info->ps_arb_version = PS_VERSION_11;
         GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max));
         gl_info->ps_arb_constantsF = gl_max;
         TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM float constants: %d.\n", gl_info->ps_arb_constantsF);
@@ -1446,7 +1442,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
     }
     if (gl_info->supported[ARB_VERTEX_PROGRAM])
     {
-        gl_info->vs_arb_version = VS_VERSION_11;
         GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max));
         gl_info->vs_arb_constantsF = gl_max;
         TRACE_(d3d_caps)("Max ARB_VERTEX_PROGRAM float constants: %d.\n", gl_info->vs_arb_constantsF);
@@ -1474,10 +1469,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
         gl_info->max_glsl_varyings = gl_max;
         TRACE_(d3d_caps)("Max GLSL varyings: %u (%u 4 component varyings).\n", gl_max, gl_max / 4);
     }
-    if (gl_info->supported[EXT_VERTEX_SHADER])
-    {
-        gl_info->vs_ati_version = VS_VERSION_11;
-    }
     if (gl_info->supported[NV_VERTEX_PROGRAM3])
     {
         gl_info->vs_nv_version = VS_VERSION_30;
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index 5802bf8..b58e1dd 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -4004,12 +4004,9 @@ struct wined3d_gl_info
     unsigned int vs_glsl_constantsF;
     unsigned int ps_glsl_constantsF;

-    GL_PSVersion ps_arb_version;
     GL_PSVersion ps_nv_version;

-    GL_VSVersion vs_arb_version;
     GL_VSVersion vs_nv_version;
-    GL_VSVersion vs_ati_version;

DWORD reserved_glsl_constants;