diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-27 10:48:05 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-27 10:48:05 +0100 |
| commit | 9bed5520560f553ac8ad4985ed41b31499d903fc (patch) | |
| tree | e7e6587df3f87e4d5398da78a6b0761171da7d68 /mesalib/src/mesa/main/eval.c | |
| parent | b14c3b05e45201bbbbb3a4beba260c3d6ff31003 (diff) | |
| parent | c74ef795c7282681616decc36a9a81cd1b1b6ec7 (diff) | |
| download | vcxsrv-9bed5520560f553ac8ad4985ed41b31499d903fc.tar.gz vcxsrv-9bed5520560f553ac8ad4985ed41b31499d903fc.tar.bz2 vcxsrv-9bed5520560f553ac8ad4985ed41b31499d903fc.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa pixman xkeyboard-config
Diffstat (limited to 'mesalib/src/mesa/main/eval.c')
| -rw-r--r-- | mesalib/src/mesa/main/eval.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/eval.c b/mesalib/src/mesa/main/eval.c index 44b57929e..b3c284175 100644 --- a/mesalib/src/mesa/main/eval.c +++ b/mesalib/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); + } } |