From bc70bad59bde311434349bbe07b7fb1d3b0ec559 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Wed, 7 Jun 2017 13:26:16 +1000 Subject: mesa: inline vbo_exec_invalidate_state() and call from mesa core MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rather than calling it indirectly in each driver. Reviewed-by: Samuel Pitoiset Reviewed-by: Brian Paul Reviewed-by: Marek Olšák --- src/mesa/drivers/dri/i915/i915_context.c | 1 - src/mesa/drivers/dri/i915/intel_context.c | 1 - src/mesa/drivers/dri/i965/brw_context.c | 1 - src/mesa/drivers/dri/nouveau/nouveau_state.c | 1 - src/mesa/drivers/dri/r200/r200_state.c | 1 - src/mesa/drivers/dri/radeon/radeon_state.c | 1 - src/mesa/drivers/dri/swrast/swrast.c | 1 - src/mesa/drivers/osmesa/osmesa.c | 1 - src/mesa/drivers/x11/xm_dd.c | 1 - 9 files changed, 9 deletions(-) (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c index 1406b65b654..4d89af182d5 100644 --- a/src/mesa/drivers/dri/i915/i915_context.c +++ b/src/mesa/drivers/dri/i915/i915_context.c @@ -58,7 +58,6 @@ i915InvalidateState(struct gl_context * ctx) _swrast_InvalidateState(ctx, new_state); _swsetup_InvalidateState(ctx, new_state); - _vbo_InvalidateState(ctx, new_state); _tnl_InvalidateState(ctx, new_state); _tnl_invalidate_vertex_state(ctx, new_state); intel_context(ctx)->NewGLState |= new_state; diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c index 6c59b425a91..7f3924573f9 100644 --- a/src/mesa/drivers/dri/i915/intel_context.c +++ b/src/mesa/drivers/dri/i915/intel_context.c @@ -321,7 +321,6 @@ intelInvalidateState(struct gl_context * ctx) if (ctx->swrast_context) _swrast_InvalidateState(ctx, new_state); - _vbo_InvalidateState(ctx, new_state); intel->NewGLState |= new_state; diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 81166450b90..6d27866fcea 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -196,7 +196,6 @@ intel_update_state(struct gl_context * ctx) if (ctx->swrast_context) _swrast_InvalidateState(ctx, new_state); - _vbo_InvalidateState(ctx, new_state); brw->NewGLState |= new_state; diff --git a/src/mesa/drivers/dri/nouveau/nouveau_state.c b/src/mesa/drivers/dri/nouveau/nouveau_state.c index 567f32fa431..6d998fca832 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_state.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_state.c @@ -494,7 +494,6 @@ nouveau_update_state(struct gl_context *ctx) _swrast_InvalidateState(ctx, new_state); _tnl_InvalidateState(ctx, new_state); - _vbo_InvalidateState(ctx, new_state); nouveau_state_emit(ctx); } diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index d5a6f091749..30437e3201a 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -2284,7 +2284,6 @@ static void r200InvalidateState(struct gl_context *ctx) _swrast_InvalidateState( ctx, new_state ); _swsetup_InvalidateState( ctx, new_state ); - _vbo_InvalidateState( ctx, new_state ); _tnl_InvalidateState( ctx, new_state ); R200_CONTEXT(ctx)->radeon.NewGLState |= new_state; diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c index ff2a7089dd2..940f8de3b48 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state.c +++ b/src/mesa/drivers/dri/radeon/radeon_state.c @@ -2050,7 +2050,6 @@ static void radeonInvalidateState(struct gl_context *ctx) _swrast_InvalidateState( ctx, new_state ); _swsetup_InvalidateState( ctx, new_state ); - _vbo_InvalidateState( ctx, new_state ); _tnl_InvalidateState( ctx, new_state ); R100_CONTEXT(ctx)->radeon.NewGLState |= new_state; } diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c index a68f7a0b96a..3b1de420f6d 100644 --- a/src/mesa/drivers/dri/swrast/swrast.c +++ b/src/mesa/drivers/dri/swrast/swrast.c @@ -704,7 +704,6 @@ update_state(struct gl_context *ctx) /* not much to do here - pass it on */ _swrast_InvalidateState( ctx, new_state ); _swsetup_InvalidateState( ctx, new_state ); - _vbo_InvalidateState( ctx, new_state ); _tnl_InvalidateState( ctx, new_state ); } diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index ed69353743a..c77dcc4d372 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -123,7 +123,6 @@ osmesa_update_state(struct gl_context *ctx, GLuint new_state) _swrast_InvalidateState( ctx, new_state ); _swsetup_InvalidateState( ctx, new_state ); _tnl_InvalidateState( ctx, new_state ); - _vbo_InvalidateState( ctx, new_state ); } static void diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c index e06831ca777..61aa6c88aa3 100644 --- a/src/mesa/drivers/x11/xm_dd.c +++ b/src/mesa/drivers/x11/xm_dd.c @@ -689,7 +689,6 @@ xmesa_update_state(struct gl_context *ctx) */ _swrast_InvalidateState( ctx, new_state ); _tnl_InvalidateState( ctx, new_state ); - _vbo_InvalidateState( ctx, new_state ); _swsetup_InvalidateState( ctx, new_state ); if (_mesa_is_user_fbo(ctx->DrawBuffer)) -- cgit v1.2.3