diff options
| author | Paul Berry <[email protected]> | 2011-12-20 16:18:39 -0800 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2011-12-21 13:33:31 -0800 |
| commit | aee96806f049c17384a8edc11acce76257d98a57 (patch) | |
| tree | 59c1eda366888295e188e18858b146097035c17f /src/mesa/main/accum.c | |
| parent | 636f2fc46c83d471b60b96bca1ced0c78b3415b5 (diff) | |
mesa: Move RasterDiscard to toplevel of gl_context.
Previously we were storing the RasterDiscard flag (for
GL_RASTERIZER_DISCARD) in gl_context::TransformFeedback. This was
confusing, because we use the _NEW_TRANSFORM flag (not
_NEW_TRANSFORM_FEEDBACK) to track state updates to it, and because
rasterizer discard has effects even when transform feedback is not in
use.
This patch makes RasterDiscard a toplevel element in gl_context rather
than a subfield of gl_context::TransformFeedback.
Note: We can't put RasterDiscard inside gl_context::Transform, since
all items inside gl_context::Transform need to be pieces of state that
are saved and restored using PushAttrib and PopAttrib.
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa/main/accum.c')
| -rw-r--r-- | src/mesa/main/accum.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c index eb06bbb6e89..a8c30c22399 100644 --- a/src/mesa/main/accum.c +++ b/src/mesa/main/accum.c @@ -100,7 +100,7 @@ _mesa_Accum( GLenum op, GLfloat value ) return; } - if (ctx->TransformFeedback.RasterDiscard) + if (ctx->RasterDiscard) return; if (ctx->RenderMode == GL_RENDER) { |