Merge branch 'primitive-restart-cleanup'

Conflicts:
	docs/relnotes-7.10.html

This branch is a re-do of the primitive-restart branch with all
the intermediate/temporary stuff cleaned out.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c
index 9a36394d65e..08b4b4a3b67 100644
--- a/src/mesa/main/api_noop.c
+++ b/src/mesa/main/api_noop.c
@@ -679,6 +679,16 @@ static void GLAPIENTRY _mesa_noop_End( void )
 }
 
 
+/***
+ * PrimitiveRestart called outside glBegin()/End(): raise an error
+ */
+static void GLAPIENTRY _mesa_noop_PrimitiveRestartNV( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glPrimitiveRestartNV(no glBegin)");
+}
+
+
 /**
  * Execute a glRectf() function.  This is not suitable for GL_COMPILE
  * modes (as the test for outside begin/end is not compiled),
@@ -1007,6 +1017,8 @@ _mesa_noop_vtxfmt_init( GLvertexformat *vfmt )
    vfmt->EdgeFlag = _mesa_noop_EdgeFlag;
    vfmt->End = _mesa_noop_End;
 
+   vfmt->PrimitiveRestartNV = _mesa_noop_PrimitiveRestartNV;
+
    _MESA_INIT_EVAL_VTXFMT(vfmt, _mesa_noop_);
 
    vfmt->FogCoordfEXT = _mesa_noop_FogCoordfEXT;