Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
e5f42f91
Commit
e5f42f91
authored
Jul 05, 2008
by
Stefan Dösinger
Committed by
Alexandre Julliard
Jul 18, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove GL_EXT_vertex_weighting stubs.
parent
ebc77732
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
35 deletions
+0
-35
directx.c
dlls/wined3d/directx.c
+0
-1
state.c
dlls/wined3d/state.c
+0
-16
wined3d_gl.h
include/wine/wined3d_gl.h
+0
-18
No files found.
dlls/wined3d/directx.c
View file @
e5f42f91
...
@@ -112,7 +112,6 @@ static const struct {
...
@@ -112,7 +112,6 @@ static const struct {
{
"GL_EXT_texture_lod"
,
EXT_TEXTURE_LOD
,
0
},
{
"GL_EXT_texture_lod"
,
EXT_TEXTURE_LOD
,
0
},
{
"GL_EXT_texture_lod_bias"
,
EXT_TEXTURE_LOD_BIAS
,
0
},
{
"GL_EXT_texture_lod_bias"
,
EXT_TEXTURE_LOD_BIAS
,
0
},
{
"GL_EXT_vertex_shader"
,
EXT_VERTEX_SHADER
,
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
},
{
"GL_EXT_gpu_program_parameters"
,
EXT_GPU_PROGRAM_PARAMETERS
,
0
},
/* NV */
/* NV */
...
...
dlls/wined3d/state.c
View file @
e5f42f91
...
@@ -2864,8 +2864,6 @@ static inline void unloadVertexData(IWineD3DStateBlockImpl *stateblock) {
...
@@ -2864,8 +2864,6 @@ static inline void unloadVertexData(IWineD3DStateBlockImpl *stateblock) {
}
}
if
(
GL_SUPPORT
(
ARB_VERTEX_BLEND
))
{
if
(
GL_SUPPORT
(
ARB_VERTEX_BLEND
))
{
glDisableClientState
(
GL_WEIGHT_ARRAY_ARB
);
glDisableClientState
(
GL_WEIGHT_ARRAY_ARB
);
}
else
if
(
GL_SUPPORT
(
EXT_VERTEX_WEIGHTING
))
{
glDisableClientState
(
GL_VERTEX_WEIGHT_ARRAY_EXT
);
}
}
unloadTexCoords
(
stateblock
);
unloadTexCoords
(
stateblock
);
}
}
...
@@ -3099,20 +3097,6 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte
...
@@ -3099,20 +3097,6 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte
showfixme
=
FALSE
;
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
{
}
else
{
/* TODO: support blends in drawStridedSlow
/* TODO: support blends in drawStridedSlow
* No need to write a FIXME here, this is done after the general vertex decl decoding
* No need to write a FIXME here, this is done after the general vertex decl decoding
...
...
include/wine/wined3d_gl.h
View file @
e5f42f91
...
@@ -2450,23 +2450,6 @@ typedef void (WINE_GLAPI * PGLFNGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint
...
@@ -2450,23 +2450,6 @@ typedef void (WINE_GLAPI * PGLFNGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint
#define GL_INCR_WRAP_EXT 0x8507
#define GL_INCR_WRAP_EXT 0x8507
#define GL_DECR_WRAP_EXT 0x8508
#define GL_DECR_WRAP_EXT 0x8508
#endif
#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 */
/* GL_NV_half_float */
#ifndef GL_NV_half_float
#ifndef GL_NV_half_float
...
@@ -3346,7 +3329,6 @@ typedef enum _GL_SupportedExt {
...
@@ -3346,7 +3329,6 @@ typedef enum _GL_SupportedExt {
EXT_TEXTURE_ENV_COMBINE
,
EXT_TEXTURE_ENV_COMBINE
,
EXT_TEXTURE_ENV_DOT3
,
EXT_TEXTURE_ENV_DOT3
,
EXT_TEXTURE_SRGB
,
EXT_TEXTURE_SRGB
,
EXT_VERTEX_WEIGHTING
,
EXT_GPU_PROGRAM_PARAMETERS
,
EXT_GPU_PROGRAM_PARAMETERS
,
/* NVIDIA */
/* NVIDIA */
NV_HALF_FLOAT
,
NV_HALF_FLOAT
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment