diff options
| author | Ian Romanick <[email protected]> | 2013-02-19 15:23:57 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2013-02-20 12:46:58 -0800 |
| commit | 8b586322e71d5ad0ce95d0fbcbfeb4df13f65040 (patch) | |
| tree | ba19d57053874d5bd4617e3920058798da52edef /src/mesa/main/eval.c | |
| parent | 83f7cde1821d8e004d49fb966a323c037631b9a2 (diff) | |
mesa: Don't install glEvalMesh in the beginend dispatch table
NOTE: This is a candidate for the 9.1 branch.
Signed-off-by: Ian Romanick <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59740
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/main/eval.c')
| -rw-r--r-- | src/mesa/main/eval.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c index 44b57929e3e..b3c28417593 100644 --- a/src/mesa/main/eval.c +++ b/src/mesa/main/eval.c @@ -824,7 +824,8 @@ _mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2, void _mesa_install_eval_vtxfmt(struct _glapi_table *disp, - const GLvertexformat *vfmt) + const GLvertexformat *vfmt, + bool beginend) { SET_EvalCoord1f(disp, vfmt->EvalCoord1f); SET_EvalCoord1fv(disp, vfmt->EvalCoord1fv); @@ -833,8 +834,12 @@ _mesa_install_eval_vtxfmt(struct _glapi_table *disp, SET_EvalPoint1(disp, vfmt->EvalPoint1); SET_EvalPoint2(disp, vfmt->EvalPoint2); - SET_EvalMesh1(disp, vfmt->EvalMesh1); - SET_EvalMesh2(disp, vfmt->EvalMesh2); + /* glEvalMesh1 and glEvalMesh2 are not allowed between glBegin and glEnd. + */ + if (!beginend) { + SET_EvalMesh1(disp, vfmt->EvalMesh1); + SET_EvalMesh2(disp, vfmt->EvalMesh2); + } } |