diff options
| author | Eric Anholt <[email protected]> | 2012-03-14 14:39:15 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-03-19 22:01:22 -0700 |
| commit | 7ca4f07b5b77ccac0a9b60dc5ac9082906b5947e (patch) | |
| tree | 95685d366aef37c3d16c5f6dccc3b3dd5777a3dd /src/mesa/vbo | |
| parent | ca760181b4420696c7e86aa2951d7203522ad1e8 (diff) | |
mesa: Fold error generation into _mesa_valid_prim_mode().
We want to start emitting an INVALID_OPERATION from here for transform
feedback. Note that this forced dlist.c to almost not use this
function, since it wants different behavior during dlist compile.
Just pull the non-TF, non-GS test out for compile, because:
1) TF doesn't matter in that case because there's no drawing.
2) I don't think we're going to see GSes and display lists in the same
context, if we don't do GL_ARB_compatibility.
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/vbo')
| -rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index cb5f9ae522b..30619906706 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -696,8 +696,7 @@ static void GLAPIENTRY vbo_exec_Begin( GLenum mode ) struct vbo_exec_context *exec = &vbo_context(ctx)->exec; int i; - if (!_mesa_valid_prim_mode(ctx, mode)) { - _mesa_error(ctx, GL_INVALID_ENUM, "glBegin"); + if (!_mesa_valid_prim_mode(ctx, mode, "glBegin")) { return; } |