Mesa (mesa_7_7_branch): st/mesa: restore draw rasterization stage after rasterpos
Brian Paul
brianp at kemper.freedesktop.org
Sat Feb 13 00:19:08 UTC 2010
Module: Mesa
Branch: mesa_7_7_branch
Commit: b3c7dc6ff232eb4c5ff6b0ddcfa90bcb56f78df1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b3c7dc6ff232eb4c5ff6b0ddcfa90bcb56f78df1
Author: Brian Paul <brianp at vmware.com>
Date: Fri Feb 12 17:16:10 2010 -0700
st/mesa: restore draw rasterization stage after rasterpos
This fixes invalid calls to rastpos_point/line/tri() that can occur
when glRasterPos() is called while in feedback or selection mode.
---
src/mesa/state_tracker/st_cb_rasterpos.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_rasterpos.c b/src/mesa/state_tracker/st_cb_rasterpos.c
index 42a1377..4692891 100644
--- a/src/mesa/state_tracker/st_cb_rasterpos.c
+++ b/src/mesa/state_tracker/st_cb_rasterpos.c
@@ -251,6 +251,14 @@ st_RasterPos(GLcontext *ctx, const GLfloat v[4])
/* draw the point */
st_feedback_draw_vbo(ctx, rs->arrays, &rs->prim, 1, NULL, GL_TRUE, 0, 1);
+
+ /* restore draw's rasterization stage depending on rendermode */
+ if (ctx->RenderMode == GL_FEEDBACK) {
+ draw_set_rasterize_stage(draw, st->feedback_stage);
+ }
+ else if (ctx->RenderMode == GL_SELECT) {
+ draw_set_rasterize_stage(draw, st->selection_stage);
+ }
}
More information about the mesa-commit
mailing list