diff options
author | Timothy Arceri <[email protected]> | 2017-06-07 12:19:13 +1000 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-06-09 09:13:46 +1000 |
commit | f77740f14b9057de09e61e1abf086f08a68c5a1b (patch) | |
tree | 5ceb8833e435180d8f6850b98879c0ca0b370f1d /src/mesa/drivers/dri/r200 | |
parent | f627ac6e355a5eeb9618a0e4fff0ec26bd3c63ba (diff) |
mesa: stop passing state bitfield to UpdateState()
The code comment which seems to have been added in cab974cf6c2db
(from year 2000) says:
"Set ctx->NewState to zero to avoid recursion if
Driver.UpdateState() has to call FLUSH_VERTICES(). (fixed?)"
As far as I can tell nothing in any of the UpdateState() calls
should cause it to be called recursively.
V2: add a wrapper around the osmesa update function so it can still
be used internally.
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/r200')
-rw-r--r-- | src/mesa/drivers/dri/r200/r200_state.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index 9fb15f24908..d5a6f091749 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -2276,8 +2276,10 @@ GLboolean r200ValidateState( struct gl_context *ctx ) } -static void r200InvalidateState( struct gl_context *ctx, GLuint new_state ) +static void r200InvalidateState(struct gl_context *ctx) { + GLuint new_state = ctx->NewState; + r200ContextPtr rmesa = R200_CONTEXT(ctx); _swrast_InvalidateState( ctx, new_state ); |