Module: wine Branch: master Commit: e5f42f91b6a69e1a0d0898936cdd5e4fece5d618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f42f91b6a69e1a0d0898936c...
Author: Stefan Dösinger stefan@codeweavers.com Date: Sat Jul 5 16:26:33 2008 -0500
wined3d: Remove GL_EXT_vertex_weighting stubs.
---
dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 16 ---------------- include/wine/wined3d_gl.h | 18 ------------------ 3 files changed, 0 insertions(+), 35 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 24a26d0..bb559aa 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -112,7 +112,6 @@ static const struct { {"GL_EXT_texture_lod", EXT_TEXTURE_LOD, 0 }, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS, 0 }, {"GL_EXT_vertex_shader", EXT_VERTEX_SHADER, 0 }, - {"GL_EXT_vertex_weighting", EXT_VERTEX_WEIGHTING, 0 }, {"GL_EXT_gpu_program_parameters", EXT_GPU_PROGRAM_PARAMETERS, 0 },
/* NV */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index abbeeb2..f665c05 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2864,8 +2864,6 @@ static inline void unloadVertexData(IWineD3DStateBlockImpl *stateblock) { } if (GL_SUPPORT(ARB_VERTEX_BLEND)) { glDisableClientState(GL_WEIGHT_ARRAY_ARB); - } else if (GL_SUPPORT(EXT_VERTEX_WEIGHTING)) { - glDisableClientState(GL_VERTEX_WEIGHT_ARRAY_EXT); } unloadTexCoords(stateblock); } @@ -3099,20 +3097,6 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte showfixme = FALSE; } } - } else if (GL_SUPPORT(EXT_VERTEX_WEIGHTING)) { - /* FIXME("TODO\n");*/ -#if 0 - - GL_EXTCALL(glVertexWeightPointerEXT)( - WINED3D_ATR_SIZE(sd->u.s.blendWeights.dwType), - WINED3D_ATR_GLTYPE(sd->u.s.blendWeights.dwType), - sd->u.s.blendWeights.dwStride, - sd->u.s.blendWeights.lpData + stateblock->loadBaseVertexIndex * sd->u.s.blendWeights.dwStride); - checkGLcall("glVertexWeightPointerEXT(numBlends, ...)"); - glEnableClientState(GL_VERTEX_WEIGHT_ARRAY_EXT); - checkGLcall("glEnableClientState(GL_VERTEX_WEIGHT_ARRAY_EXT)"); -#endif - } else { /* TODO: support blends in drawStridedSlow * No need to write a FIXME here, this is done after the general vertex decl decoding diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 58f0cbc..405ea68 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -2450,23 +2450,6 @@ typedef void (WINE_GLAPI * PGLFNGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint #define GL_INCR_WRAP_EXT 0x8507 #define GL_DECR_WRAP_EXT 0x8508 #endif -/* GL_EXT_vertex_weighting */ -#ifndef GL_EXT_vertex_weighting -#define GL_EXT_vertex_weighting 1 -#define GL_MODELVIEW0_STACK_DEPTH_EXT GL_MODELVIEW_STACK_DEPTH -#define GL_MODELVIEW1_STACK_DEPTH_EXT 0x8502 -#define GL_MODELVIEW0_MATRIX_EXT GL_MODELVIEW_MATRIX -#define GL_MODELVIEW1_MATRIX_EXT 0x8506 -#define GL_VERTEX_WEIGHTING_EXT 0x8509 -#define GL_MODELVIEW0_EXT GL_MODELVIEW -#define GL_MODELVIEW1_EXT 0x850A -#define GL_CURRENT_VERTEX_WEIGHT_EXT 0x850B -#define GL_VERTEX_WEIGHT_ARRAY_EXT 0x850C -#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT 0x850D -#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT 0x850E -#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F -#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510 -#endif
/* GL_NV_half_float */ #ifndef GL_NV_half_float @@ -3346,7 +3329,6 @@ typedef enum _GL_SupportedExt { EXT_TEXTURE_ENV_COMBINE, EXT_TEXTURE_ENV_DOT3, EXT_TEXTURE_SRGB, - EXT_VERTEX_WEIGHTING, EXT_GPU_PROGRAM_PARAMETERS, /* NVIDIA */ NV_HALF_FLOAT,