[PATCH] WineD3D: Remove GL_EXT_vertex_weighting stubs=0A=

[Stefan Doesinger]

=0A=
Even though I like obscure extensions, I think this one here=0A=
is useless. The code is pretty much nonexistant, and the=0A=
extension is not supported in any driver because it was=0A=
phased out by GL_ARB_vertex_blend(vertex_weighting is a=0A=
special case of vertex_blend), which in turn was phased out=0A=
by GL_ARB_vertex_program.=0A=
=0A=
This removes a bit of dead code and dead if instructions that=0A=
the compiler can't eliminate because it doesn't know this=0A=
extension is dead=0A=
---=0A=
 dlls/wined3d/directx.c    |    1 -=0A=
 dlls/wined3d/state.c      |   16 ----------------=0A=
 include/wine/wined3d_gl.h |   18 ------------------=0A=
 3 files changed, 0 insertions(+), 35 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c=0A=
index 24a26d0..bb559aa 100644=0A=
--- a/dlls/wined3d/directx.c=0A=
+++ b/dlls/wined3d/directx.c=0A=
@@ -112,7 +112,6 @@ static const struct {=0A=
     {"GL_EXT_texture_lod",                  EXT_TEXTURE_LOD,            =
    0                           },=0A=
     {"GL_EXT_texture_lod_bias",             EXT_TEXTURE_LOD_BIAS,       =
    0                           },=0A=
     {"GL_EXT_vertex_shader",                EXT_VERTEX_SHADER,          =
    0                           },=0A=
-    {"GL_EXT_vertex_weighting",             EXT_VERTEX_WEIGHTING,       =
    0                           },=0A=
     {"GL_EXT_gpu_program_parameters",       EXT_GPU_PROGRAM_PARAMETERS, =
    0                           },=0A=
 =0A=
     /* NV */=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index abbeeb2..f665c05 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -2864,8 +2864,6 @@ static inline void =
unloadVertexData(IWineD3DStateBlockImpl *stateblock) {=0A=
     }=0A=
     if (GL_SUPPORT(ARB_VERTEX_BLEND)) {=0A=
         glDisableClientState(GL_WEIGHT_ARRAY_ARB);=0A=
-    } else if (GL_SUPPORT(EXT_VERTEX_WEIGHTING)) {=0A=
-        glDisableClientState(GL_VERTEX_WEIGHT_ARRAY_EXT);=0A=
     }=0A=
     unloadTexCoords(stateblock);=0A=
 }=0A=
@@ -3099,20 +3097,6 @@ static void loadVertexData(IWineD3DStateBlockImpl =
*stateblock, WineDirect3DVerte=0A=
                     showfixme =3D FALSE;=0A=
                 }=0A=
             }=0A=
-        } else if (GL_SUPPORT(EXT_VERTEX_WEIGHTING)) {=0A=
-            /* FIXME("TODO\n");*/=0A=
-#if 0=0A=
-=0A=
-            GL_EXTCALL(glVertexWeightPointerEXT)(=0A=
-                WINED3D_ATR_SIZE(sd->u.s.blendWeights.dwType),=0A=
-                WINED3D_ATR_GLTYPE(sd->u.s.blendWeights.dwType),=0A=
-                sd->u.s.blendWeights.dwStride,=0A=
-                sd->u.s.blendWeights.lpData + =
stateblock->loadBaseVertexIndex * sd->u.s.blendWeights.dwStride);=0A=
-            checkGLcall("glVertexWeightPointerEXT(numBlends, ...)");=0A=
-            glEnableClientState(GL_VERTEX_WEIGHT_ARRAY_EXT);=0A=
-            =
checkGLcall("glEnableClientState(GL_VERTEX_WEIGHT_ARRAY_EXT)");=0A=
-#endif=0A=
-=0A=
         } else {=0A=
             /* TODO: support blends in drawStridedSlow=0A=
              * No need to write a FIXME here, this is done after the =
general vertex decl decoding=0A=
diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h=0A=
index 58f0cbc..405ea68 100644=0A=
--- a/include/wine/wined3d_gl.h=0A=
+++ b/include/wine/wined3d_gl.h=0A=
@@ -2450,23 +2450,6 @@ typedef void (WINE_GLAPI * =
PGLFNGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint=0A=
 #define GL_INCR_WRAP_EXT                  0x8507=0A=
 #define GL_DECR_WRAP_EXT                  0x8508=0A=
 #endif=0A=
-/* GL_EXT_vertex_weighting */=0A=
-#ifndef GL_EXT_vertex_weighting=0A=
-#define GL_EXT_vertex_weighting 1=0A=
-#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH=0A=
-#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502=0A=
-#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX=0A=
-#define GL_MODELVIEW1_MATRIX_EXT          0x8506=0A=
-#define GL_VERTEX_WEIGHTING_EXT           0x8509=0A=
-#define GL_MODELVIEW0_EXT                 GL_MODELVIEW=0A=
-#define GL_MODELVIEW1_EXT                 0x850A=0A=
-#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B=0A=
-#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C=0A=
-#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D=0A=
-#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E=0A=
-#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F=0A=
-#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510=0A=
-#endif=0A=
 =0A=
 /* GL_NV_half_float */=0A=
 #ifndef GL_NV_half_float=0A=
@@ -3346,7 +3329,6 @@ typedef enum _GL_SupportedExt {=0A=
   EXT_TEXTURE_ENV_COMBINE,=0A=
   EXT_TEXTURE_ENV_DOT3,=0A=
   EXT_TEXTURE_SRGB,=0A=
-  EXT_VERTEX_WEIGHTING,=0A=
   EXT_GPU_PROGRAM_PARAMETERS,=0A=
   /* NVIDIA */=0A=
   NV_HALF_FLOAT,=0A=
-- =0A=
1.5.4.5=0A=
=0A=

------=_NextPart_000_003E_01C8E844.F36B1300--