diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-22 14:27:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-22 14:27:38 +0100 |
| commit | 7002c66cfba01e7d3b88dae498a195f78f0e83f5 (patch) | |
| tree | 2fbbd202a6a4243f0e64a8b22e22417a609ae19d /mesalib/src/mesa/main/lines.c | |
| parent | 50c07563e17397daf040a32d8fdd3ab397e72371 (diff) | |
| parent | 470f7ca9f0be348faf2f03fc16811844c5eeffce (diff) | |
| download | vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.tar.gz vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.tar.bz2 vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-config
Conflicts:
mesalib/src/mesa/main/syncobj.c
mesalib/src/mesa/main/syncobj.h
xorg-server/hw/xwin/winconfig.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
Diffstat (limited to 'mesalib/src/mesa/main/lines.c')
| -rw-r--r-- | mesalib/src/mesa/main/lines.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/lines.c b/mesalib/src/mesa/main/lines.c index e400b3913..a01219c42 100644 --- a/mesalib/src/mesa/main/lines.c +++ b/mesalib/src/mesa/main/lines.c @@ -41,7 +41,6 @@ void GLAPIENTRY _mesa_LineWidth( GLfloat width ) { GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END(ctx); if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glLineWidth %f\n", width); @@ -95,7 +94,6 @@ void GLAPIENTRY _mesa_LineStipple( GLint factor, GLushort pattern ) { GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END(ctx); if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glLineStipple %d %u\n", factor, pattern); |