Mesa (master): r200/radeon: stop calling _ae_invalidate_state() directly

[Timothy Arceri]

Module: Mesa
Branch: master
Commit: df27aba422fa88c8e1a6d40d625e07f6a879db3e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=df27aba422fa88c8e1a6d40d625e07f6a879db3e

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Wed Jun  7 11:28:23 2017 +1000

r200/radeon: stop calling _ae_invalidate_state() directly

It is already called via _vbo_InvalidateState().

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Tested-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/drivers/dri/r200/r200_state.c     | 2 --
 src/mesa/drivers/dri/radeon/radeon_state.c | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
index 86733a8e25..9fb15f2490 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 c6b1f38dd0..1baf229e64 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;
 }