From: Timothy Arceri Date: Wed, 7 Jun 2017 01:28:23 +0000 (+1000) Subject: r200/radeon: stop calling _ae_invalidate_state() directly X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=df27aba422fa88c8e1a6d40d625e07f6a879db3e;p=mesa.git r200/radeon: stop calling _ae_invalidate_state() directly It is already called via _vbo_InvalidateState(). Reviewed-by: Marek Olšák Tested-by: Ian Romanick --- diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index 86733a8e25c..9fb15f24908 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -35,7 +35,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/glheader.h" #include "main/imports.h" -#include "main/api_arrayelt.h" #include "main/enums.h" #include "main/light.h" #include "main/framebuffer.h" @@ -2285,7 +2284,6 @@ static void r200InvalidateState( struct gl_context *ctx, GLuint new_state ) _swsetup_InvalidateState( ctx, new_state ); _vbo_InvalidateState( ctx, new_state ); _tnl_InvalidateState( ctx, new_state ); - _ae_invalidate_state( ctx, new_state ); R200_CONTEXT(ctx)->radeon.NewGLState |= new_state; if (new_state & _NEW_PROGRAM) diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c index c6b1f38dd02..1baf229e647 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state.c +++ b/src/mesa/drivers/dri/radeon/radeon_state.c @@ -34,7 +34,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/glheader.h" #include "main/imports.h" -#include "main/api_arrayelt.h" #include "main/enums.h" #include "main/light.h" #include "main/context.h" @@ -2051,7 +2050,6 @@ static void radeonInvalidateState( struct gl_context *ctx, GLuint new_state ) _swsetup_InvalidateState( ctx, new_state ); _vbo_InvalidateState( ctx, new_state ); _tnl_InvalidateState( ctx, new_state ); - _ae_invalidate_state( ctx, new_state ); R100_CONTEXT(ctx)->radeon.NewGLState |= new_state; }